Update DTD and XSD documents

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

diff --git a/sadf.h b/sadf.h
index 0d1e6bd27ed1a2ffb2cf280a3d730cfb1bb085f3..582659cbecad10d40e5fcfa834b5812a551276f2 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.11"
+#define XML_DTD_VERSION        "3.12"
 
 /* Various constants */
 #define DO_SAVE                0

diff --git a/xml/sysstat-3.11.dtd b/xml/sysstat-3.12.dtd
similarity index 98%
rename from xml/sysstat-3.11.dtd
rename to xml/sysstat-3.12.dtd
index 38bd657e823003c8ccdcdbc066296d23dc169a40..56b5d0b1eb9a2cf31375430de6ece0185ecc5a02 100644 (file)
--- a/xml/sysstat-3.11.dtd
+++ b/xml/sysstat-3.12.dtd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--DTD v3.11 for sysstat. See sadf.h -->
+<!--DTD v3.12 for sysstat. See sadf.h -->
 
 <!ELEMENT sysstat (sysdata-version, host)>
 <!ATTLIST sysstat
@@ -38,7 +38,8 @@
 <!ATTLIST timestamp
        date CDATA #REQUIRED
        time CDATA #REQUIRED
-       utc CDATA #REQUIRED
+       utc CDATA #IMPLIED
+       tz CDATA #IMPLIED
        interval CDATA #REQUIRED
 >
 
@@ -48,7 +49,8 @@
 <!ATTLIST boot
        date CDATA #REQUIRED
        time CDATA #REQUIRED
-       utc CDATA #REQUIRED
+       utc CDATA #IMPLIED
+       tz CDATA #IMPLIED
        cpu_count CDATA #REQUIRED
 >
 
@@ -58,7 +60,8 @@
 <!ATTLIST comment
        date CDATA #REQUIRED
        time CDATA #REQUIRED
-       utc CDATA #REQUIRED
+       utc CDATA #IMPLIED
+       tz CDATA #IMPLIED
        com CDATA #REQUIRED
 >
 

diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index 30c42782626617db4a1fa79b4392fd50428bc4ce..309cd063707aa5fd1388948952a4ed03c1f81c3a 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.11 for sysstat. See sadf.h --</xs:appinfo>
+       <xs:appinfo>-- XML Schema v3.12 for sysstat. See sadf.h --</xs:appinfo>
 </xs:annotation>
 
 <xs:element name="sysstat" type="sysstat-type"></xs:element>
@@ -113,7 +113,8 @@
        </xs:sequence>
        <xs:attribute name="date" type="xs:date" use="required"></xs:attribute>
        <xs:attribute name="time" type="xs:time" use="required"></xs:attribute>
-       <xs:attribute name="utc" type="xs:nonNegativeInteger" use="required"></xs:attribute>
+       <xs:attribute name="utc" type="xs:nonNegativeInteger"></xs:attribute>
+       <xs:attribute name="tz" type="xs:string"></xs:attribute>
        <xs:attribute name="interval" type="xs:nonNegativeInteger" use="required"></xs:attribute>
 </xs:complexType>
 
@@ -121,7 +122,8 @@
 <xs:complexType name="boot-type">
        <xs:attribute name="date" type="xs:date" use="required"></xs:attribute>
        <xs:attribute name="time" type="xs:time" use="required"></xs:attribute>
-       <xs:attribute name="utc" type="xs:nonNegativeInteger" use="required"></xs:attribute>
+       <xs:attribute name="utc" type="xs:nonNegativeInteger"></xs:attribute>
+       <xs:attribute name="tz" type="xs:string"></xs:attribute>
        <xs:attribute name="cpu_count" type="xs:nonNegativeInteger" use="required"></xs:attribute>
 </xs:complexType>
 
@@ -129,7 +131,8 @@
 <xs:complexType name="comment-type">
        <xs:attribute name="date" type="xs:date" use="required"></xs:attribute>
        <xs:attribute name="time" type="xs:time" use="required"></xs:attribute>
-       <xs:attribute name="utc" type="xs:nonNegativeInteger" use="required"></xs:attribute>
+       <xs:attribute name="utc" type="xs:nonNegativeInteger"></xs:attribute>
+       <xs:attribute name="tz" type="xs:string"></xs:attribute>
        <xs:attribute name="com" type="xs:string" use="required"></xs:attribute>
 </xs:complexType>