Update DTD and XSD documents

Update DTD and XSD documents to take into account the creation time of
the datafile displayed by sadf -x.

Signed-off-by: Sebastien GODARD <sysstat@orange.fr.fake>

diff --git a/sadf.h b/sadf.h
index 77edab3dc14080fab6a0796e91100f115fc28cec..67ba3cba5dd2b7531f900182a7897093cc2ae24a 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.17"
+#define XML_DTD_VERSION        "2.18"
 
 /* Possible actions for functions used to display reports */
 #define F_BEGIN        0x01

diff --git a/xml/sysstat-2.17.dtd b/xml/sysstat-2.18.dtd
similarity index 99%
rename from xml/sysstat-2.17.dtd
rename to xml/sysstat-2.18.dtd
index 64baaafd05a82e9b2cb3afb185ead563f984b4ed..a239f88400e277bb0ab5eb342961d8dc545569e5 100644 (file)
--- a/xml/sysstat-2.17.dtd
+++ b/xml/sysstat-2.18.dtd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--DTD v2.17 for sysstat. See sadf.h -->
+<!--DTD v2.18 for sysstat. See sadf.h -->
 
 <!ELEMENT sysstat (sysdata-version, host)>
 
@@ -23,6 +23,8 @@
 
 <!ELEMENT file-date (#PCDATA)>
 
+<!ELEMENT file-utc-time (#PCDATA)>
+
 <!ELEMENT statistics (timestamp+)>
 
 <!ELEMENT timestamp (%TIMESTAMP_ELEMENTS;)+>

diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index 0195a84f72deb9d0d4ff97626e5cbb33ee1f3a07..385d7f738703c8bfa29bd7608cc1b1c555e486af 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.17 for sysstat. See sadf.h --</xs:appinfo>
+       <xs:appinfo>-- XML Schema v2.18 for sysstat. See sadf.h --</xs:appinfo>
 </xs:annotation>
 
 <xs:element name="sysstat" type="sysstat-type"></xs:element>
@@ -25,6 +25,7 @@
                <xs:element name="release" type="release-type"></xs:element>
                <xs:element name="machine" type="machine-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="number-of-cpus" type="number-of-cpus-type"></xs:element>
                <xs:element name="statistics" type="statistics-type"></xs:element>
                <xs:element name="restarts" type="restarts-type"></xs:element>
@@ -53,6 +54,11 @@
        <xs:restriction base="xs:date"></xs:restriction>
 </xs:simpleType>
 
+<xs:element name="file-utc-time" type="file-utc-time-type"></xs:element>
+<xs:simpleType name="file-utc-time-type">
+        <xs:restriction base="xs:time"></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>