Update DTD and XSD documents

Take into account new cpu_count mark in DTD and XSD documents.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/sadf.h b/sadf.h
index 45424df8f713f9b1cdb943bdc93546c461b93c0a..701ac787cee7d7d7b4fdc08c22cf47b7a4f23e41 100644 (file)
--- a/sadf.h
+++ b/sadf.h
@@ -9,7 +9,7 @@
 #include "sa.h"
 
 /* DTD version for XML output */
-#define XML_DTD_VERSION        "2.18"
+#define XML_DTD_VERSION        "2.19"
 
 /* Possible actions for functions used to display reports */
 #define F_BEGIN        0x01

diff --git a/xml/sysstat-2.18.dtd b/xml/sysstat-2.19.dtd
similarity index 99%
rename from xml/sysstat-2.18.dtd
rename to xml/sysstat-2.19.dtd
index a239f88400e277bb0ab5eb342961d8dc545569e5..df21e9d0c7f0b307f8314414f960b246ba68f2b1 100644 (file)
--- a/xml/sysstat-2.18.dtd
+++ b/xml/sysstat-2.19.dtd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--DTD v2.18 for sysstat. See sadf.h -->
+<!--DTD v2.19 for sysstat. See sadf.h -->
 
 <!ELEMENT sysstat (sysdata-version, host)>
 
@@ -42,6 +42,7 @@
        date CDATA #REQUIRED
        time CDATA #REQUIRED
        utc CDATA #REQUIRED
+       cpu_count CDATA #REQUIRED
 >
 
 <!ELEMENT comments (comment+)>

diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index 385d7f738703c8bfa29bd7608cc1b1c555e486af..2d62522efbc17b97381a5dfb38fd2f626e3b47a7 100644 (file)
--- a/xml/sysstat.xsd
+++ b/xml/sysstat.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://pagesperso-orange.fr/sebastien.godard/sysstat" targetNamespace="http://pagesperso-orange.fr/sebastien.godard/sysstat" elementFormDefault="qualified">
 <xs:annotation>
-       <xs:appinfo>-- XML Schema v2.18 for sysstat. See sadf.h --</xs:appinfo>
+       <xs:appinfo>-- XML Schema v2.19 for sysstat. See sadf.h --</xs:appinfo>
 </xs:annotation>
 
 <xs:element name="sysstat" type="sysstat-type"></xs:element>
@@ -116,6 +116,7 @@
        <xs:attribute name="date" type="xs:date"></xs:attribute>
        <xs:attribute name="time" type="xs:time"></xs:attribute>
        <xs:attribute name="utc" type="xs:nonNegativeInteger"></xs:attribute>
+       <xs:attribute name="cpu_count" type="xs:nonNegativeInteger"></xs:attribute>
 </xs:complexType>
 
 <xs:element name="comment" type="comment-type"></xs:element>