From: Sebastien Godard <sysstat@orange.fr>
Date: Tue, 8 May 2012 12:18:59 +0000 (+0200)
Subject: XSD document updated.
X-Git-Tag: v10.0.5~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55f24acb06a4d63e859339d4b65b906f40ba7973;p=sysstat

XSD document updated.

A maxOccurs indicator has been added for the timestamp element.
This is indicator is set to "unbounded", which is compulsory here
as the default value is 1 if not specified.

Mail from Frank Glinka <glinkaf@uni-muenster.de> 24/04/2012:

There seem to be gaps/inconsistencies between the produced XML and the  sysstat.xsd that you provide on your website. The xsd does not specify any maximum occurrence indicators, which in that case default to '1'. For example, although the 'timestamp' element occurs multiple times within the 'statistics' element inside the XML, the xsd claims it appears exactly once. In that case, a 'maxOccurs="unbounded"' is required. (This is an issue if I use Java's JAXB and your sysstat.xsd to read & parse the XML file automatically.)

See:
http://www.w3.org/TR/2004/REC-xmlschema-1-20041028/structures.html#Particle_details
http://www.w3schools.com/schema/schema_complex_indicators.asp
---

diff --git a/CHANGES b/CHANGES
index fba1a72..2e1ff3f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,10 @@ xxxx/xx/xx: Version 10.0.5 - Sebastien Godard (sysstat <at> orange.fr)
 	* [Alain Chereau]: Options -g and -T added to iostat. These
 	  options enable the user to display statistics for groups of
 	  devices.
+	* XSD document updated: Added a maxOccurs indicator for the
+	  timestamp element.
 	* [Peter Schiffer]: Set exit code to 0 for sa2 shell script.
+	* iostat manual page updated.
 	* CREDITS file updated.
 
 2012/03/07: Version 10.0.4 - Sebastien Godard (sysstat <at> orange.fr)
diff --git a/CREDITS b/CREDITS
index d8f78e3..8705565 100644
--- a/CREDITS
+++ b/CREDITS
@@ -156,6 +156,7 @@ I would also thank the following people for their hints or bug reports
 	Damien Faure <damien-jn.faure@bul[...].net>
 	Dr. David Alan Gilbert <dave@tre[...].org>
 	David Gesswein <djg@drs[...].com>
+	Frank Glinka <glinkaf@uni[...].de>
 	Ladislav Hagara <ladislav.hagara@uno[...].cz>
 	Don Harrop <don@swb[...].com>
 	Jürgen Heinemann <heinemann.juergen@hjc[...].de>
diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index d98117d..f885e51 100644
--- a/xml/sysstat.xsd
+++ b/xml/sysstat.xsd
@@ -61,7 +61,7 @@
 <xs:element name="statistics" type="statistics-type"></xs:element>
 <xs:complexType name="statistics-type">
 	<xs:sequence>
-		<xs:element name="timestamp" type="timestamp-type"></xs:element>
+		<xs:element name="timestamp" type="timestamp-type" maxOccurs="unbounded"></xs:element>
 	</xs:sequence>
 </xs:complexType>