Update DTD and XSD documents to take into account new timezone field

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

diff --git a/sadf.h b/sadf.h
index 111275fc78e4a10ed57eddce50efd2c41b798428..c845c4d2920252b104767eb6f711303809f49cfc 100644 (file)
--- a/sadf.h
+++ b/sadf.h
@@ -9,7 +9,7 @@
 #include "sa.h"
 
 /* DTD version for XML output */
-#define XML_DTD_VERSION        "3.7"
+#define XML_DTD_VERSION        "3.8"
 
 /* Various constants */
 #define DO_SAVE                0

diff --git a/xml/sysstat-3.7.dtd b/xml/sysstat-3.8.dtd
similarity index 98%
rename from xml/sysstat-3.7.dtd
rename to xml/sysstat-3.8.dtd
index 374894c90c6010edb6568069188d5bbc88c2eaf8..e40de47f12a4970095c7ff59cbbf8c251168019c 100644 (file)
--- a/xml/sysstat-3.7.dtd
+++ b/xml/sysstat-3.8.dtd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--DTD v3.7 for sysstat. See sadf.h -->
+<!--DTD v3.8 for sysstat. See sadf.h -->
 
 <!ELEMENT sysstat (sysdata-version, host)>
 <!ATTLIST sysstat
@@ -11,7 +11,7 @@
 <!ELEMENT sysdata-version (#PCDATA)>
 
 <!ENTITY % TIMESTAMP_ELEMENTS "cpu-load|process-and-context-switch|interrupts|swap-pages|paging|io|memory|hugepages|kernel|queue|serial|disk|network|power-management|filesystems">
-<!ENTITY % HOST_ELEMENTS "sysname|release|machine|number-of-cpus|file-date|file-utc-time|statistics|restarts|comments">
+<!ENTITY % HOST_ELEMENTS "sysname|release|machine|number-of-cpus|file-date|file-utc-time|timezone|statistics|restarts|comments">
 
 <!ELEMENT host (%HOST_ELEMENTS;)+>
 <!ATTLIST host
@@ -28,6 +28,8 @@
 
 <!ELEMENT file-date (#PCDATA)>
 
+<!ELEMENT timezone (#PCDATA)>
+
 <!ELEMENT file-utc-time (#PCDATA)>
 
 <!ELEMENT statistics (timestamp*)>

diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index 75c0e8dd0907fd3a1ee66da24ddbd2d12141675b..164813b51cb8acfc8852ed674eb53f61d2029a79 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 v3.7 for sysstat. See sadf.h --</xs:appinfo>
+       <xs:appinfo>-- XML Schema v3.8 for sysstat. See sadf.h --</xs:appinfo>
 </xs:annotation>
 
 <xs:element name="sysstat" type="sysstat-type"></xs:element>
@@ -27,6 +27,7 @@
                <xs:element name="number-of-cpus" type="number-of-cpus-type"></xs:element>
                <xs:element name="file-date" type="file-date-type"></xs:element>
                <xs:element name="file-utc-time" type="file-utc-time-type"></xs:element>
+               <xs:element name="timezone" type="timezone-type" minOccurs="0"></xs:element>
                <xs:element name="statistics" type="statistics-type"></xs:element>
                <xs:element name="restarts" type="restarts-type"></xs:element>
                <xs:element name="comments" type="comments-type" minOccurs="0" maxOccurs="1"></xs:element>
@@ -59,6 +60,11 @@
         <xs:restriction base="xs:time"></xs:restriction>
 </xs:simpleType>
 
+<xs:element name="timezone" type="timezone-type"></xs:element>
+<xs:simpleType name="timezone-type">
+        <xs:restriction base="xs:string"></xs:restriction>
+</xs:simpleType>
+
 <xs:element name="number-of-cpus" type="number-of-cpus-type"></xs:element>
 <xs:simpleType name="number-of-cpus-type">
        <xs:restriction base="xs:nonNegativeInteger"></xs:restriction>