Fixed DTD document.

When computer has run all day without restart, XML output file
from sadf -x contains no boot elements.
So change DTD document accordingly (from <!ELEMENT restarts (boot+)>
to <!ELEMENT restarts (boot*)>).
XSD document is not updated, but its version number changes to remain
consistent with that of DTD document.

Bug reported by Peter Schiffer <pschiffe@redhat.com> 13/11/2012.

diff --git a/CHANGES b/CHANGES
index bce0d04cda21228c60bf28a2d4e56b54eeb8ee7b..4cc5e2871cf6ff1f8bbbec92eb7629a4a416d30e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Changes:
 
 xxxx/xx/xx: Version 10.1.3 - Sebastien Godard (sysstat <at> orange.fr)
+       * Fixed DTD document: If computer has run all day without
+         restart, XML output file from sadf -x has no boot elements.
 
 2012/10/06: Version 10.1.2 - Sebastien Godard (sysstat <at> orange.fr)
        * New field added to sar -u and mpstat: %gnice (time spent

diff --git a/sadf.h b/sadf.h
index 451a96ee8e0f83fe04ced9b6eb1711d95763b42c..786d3b0c2a1b6791144e283153b3ce173cd35fe9 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.14"
+#define XML_DTD_VERSION        "2.15"
 
 /* Possible actions for functions used to display reports */
 #define F_BEGIN        0x01

diff --git a/xml/sysstat-2.14.dtd b/xml/sysstat-2.15.dtd
similarity index 99%
rename from xml/sysstat-2.14.dtd
rename to xml/sysstat-2.15.dtd
index a9086d625b055819e0710d7d23ed1e695943f512..e0b7bfbfde251d06ecc964edd257f9f43edc18c1 100644 (file)
--- a/xml/sysstat-2.14.dtd
+++ b/xml/sysstat-2.15.dtd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--DTD v2.14 for sysstat. See sadf.h -->
+<!--DTD v2.15 for sysstat. See sadf.h -->
 
 <!ELEMENT sysstat (sysdata-version, host)>
 
@@ -33,7 +33,7 @@
        interval CDATA #REQUIRED
 >
 
-<!ELEMENT restarts (boot+)>
+<!ELEMENT restarts (boot*)>
 
 <!ELEMENT boot EMPTY>
 <!ATTLIST boot

diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index 5769d4c283c4e805d386269d708136065283363a..8304ac57073a362940e815400cfcc90652d13c5e 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.14 for sysstat. See sadf.h --</xs:appinfo>
+       <xs:appinfo>-- XML Schema v2.15 for sysstat. See sadf.h --</xs:appinfo>
 </xs:annotation>
 
 <xs:element name="sysstat" type="sysstat-type"></xs:element>