From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Sun, 13 Oct 2019 13:40:24 +0000 (+0200)
Subject: Update DTD and XSD documents so that XML output from 12.0.x versions
X-Git-Tag: v12.2.0~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=665e503985d3b2517eee7366785af9865e58e25e;p=sysstat

Update DTD and XSD documents so that XML output from 12.0.x versions
validates

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

diff --git a/xml/sysstat-3.8.dtd b/xml/sysstat-3.8.dtd
index e40de47..1ca3c01 100644
--- a/xml/sysstat-3.8.dtd
+++ b/xml/sysstat-3.8.dtd
@@ -122,7 +122,7 @@
 	vmeff-percent CDATA #REQUIRED
 >
 
-<!ELEMENT io (tps, io-reads, io-writes, io-discard)>
+<!ELEMENT io (tps, io-reads, io-writes, io-discard?)>
 <!ATTLIST io
 	per CDATA #REQUIRED
 >
diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index 61b281e..3f3d162 100644
--- a/xml/sysstat.xsd
+++ b/xml/sysstat.xsd
@@ -229,7 +229,7 @@
 		<xs:element name="tps" type="tps-type"></xs:element>
 		<xs:element name="io-reads" type="io-reads-type"></xs:element>
 		<xs:element name="io-writes" type="io-writes-type"></xs:element>
-		<xs:element name="io-discard" type="io-discard-type"></xs:element>
+		<xs:element name="io-discard" type="io-discard-type" minOccurs="0"></xs:element>
 	</xs:sequence>
 	<xs:attribute name="per" type="per-type" use="required"></xs:attribute>
 </xs:complexType>