From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Sat, 19 Feb 2022 11:44:44 +0000 (+0100)
Subject: XML: Update DTD and XSD documents
X-Git-Tag: v12.5.6~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cec4a61998b8c5c5eae3388ce67b3971252699e;p=sysstat

XML: Update DTD and XSD documents

If the user selects only a CPU which happens to be offline then the XML
output generated by sadf -x will contain no cpu element.
Update DTD and XSD documents so that the XML output won't be considered
as invalid.

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

diff --git a/xml/sysstat-3.10.dtd b/xml/sysstat-3.10.dtd
index 274bd36..d578c24 100644
--- a/xml/sysstat-3.10.dtd
+++ b/xml/sysstat-3.10.dtd
@@ -62,7 +62,7 @@
 	com CDATA #REQUIRED
 >
 
-<!ELEMENT cpu-load (cpu+)>
+<!ELEMENT cpu-load (cpu*)>
 
 <!ELEMENT cpu EMPTY>
 <!ATTLIST cpu
@@ -90,7 +90,7 @@
 
 <!ELEMENT interrupts (int-global)>
 
-<!ELEMENT int-global (irq+)>
+<!ELEMENT int-global (irq*)>
 <!ATTLIST int-global
 	per CDATA #REQUIRED
 >
@@ -527,7 +527,7 @@
 
 <!ELEMENT power-management (cpu-frequency?, fan-speed?, temperature?, voltage-input?, cpu-weighted-frequency?, usb-devices?)>
 
-<!ELEMENT cpu-frequency (cpufreq+)>
+<!ELEMENT cpu-frequency (cpufreq*)>
 <!ATTLIST cpu-frequency
 	unit CDATA #REQUIRED
 >
diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index f1163b0..f250420 100644
--- a/xml/sysstat.xsd
+++ b/xml/sysstat.xsd
@@ -136,7 +136,7 @@
 <xs:element name="cpu-load" type="cpu-load-type"></xs:element>
 <xs:complexType name="cpu-load-type">
 	<xs:sequence>
-		<xs:element name="cpu" type="cpu-type" minOccurs="1" maxOccurs="unbounded"></xs:element>
+		<xs:element name="cpu" type="cpu-type" minOccurs="0" maxOccurs="unbounded"></xs:element>
 	</xs:sequence>
 </xs:complexType>
 
@@ -192,7 +192,7 @@
 <xs:element name="int-global" type="int-global-type"></xs:element>
 <xs:complexType name="int-global-type">
 	<xs:sequence>
-		<xs:element name="irq" type="irq-type" minOccurs="1" maxOccurs="unbounded"></xs:element>
+		<xs:element name="irq" type="irq-type" minOccurs="0" maxOccurs="unbounded"></xs:element>
 	</xs:sequence>
 	<xs:attribute name="per" type="per-type" use="required"></xs:attribute>
 </xs:complexType>
@@ -660,7 +660,7 @@
 <xs:element name="cpu-frequency" type="cpu-frequency-type"></xs:element>
 <xs:complexType name="cpu-frequency-type">
 	<xs:sequence>
-		<xs:element name="cpufreq" type="cpufreq-type" minOccurs="1" maxOccurs="unbounded"></xs:element>
+		<xs:element name="cpufreq" type="cpufreq-type" minOccurs="0" maxOccurs="unbounded"></xs:element>
 	</xs:sequence>
 	<xs:attribute name="unit" type="frequnit-type"></xs:attribute>
 </xs:complexType>