From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Wed, 28 Dec 2022 14:00:31 +0000 (+0100)
Subject: A_PWR_BAT: Update DTD and XSD documents
X-Git-Tag: v12.7.2~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3ab679cf4a3364ac33745c90bf5b79f4e6da85c;p=sysstat

A_PWR_BAT: Update DTD and XSD documents

Update XML documents to deal with batteries statistics.

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

diff --git a/sadf.h b/sadf.h
index 3989f2e..b0a8910 100644
--- a/sadf.h
+++ b/sadf.h
@@ -9,7 +9,7 @@
 #include "sa.h"
 
 /* DTD version for XML output */
-#define XML_DTD_VERSION	"3.12"
+#define XML_DTD_VERSION	"3.13"
 
 /* Various constants */
 enum {
diff --git a/xml/sysstat-3.12.dtd b/xml/sysstat-3.13.dtd
similarity index 97%
rename from xml/sysstat-3.12.dtd
rename to xml/sysstat-3.13.dtd
index 56b5d0b..b2aab12 100644
--- a/xml/sysstat-3.12.dtd
+++ b/xml/sysstat-3.13.dtd
@@ -529,7 +529,7 @@
 	blg_len CDATA #IMPLIED
 >
 
-<!ELEMENT power-management (cpu-frequency?, fan-speed?, temperature?, voltage-input?, cpu-weighted-frequency?, usb-devices?)>
+<!ELEMENT power-management (cpu-frequency?, fan-speed?, temperature?, voltage-input?, cpu-weighted-frequency?, battery?, usb-devices?)>
 
 <!ELEMENT cpu-frequency (cpufreq*)>
 <!ATTLIST cpu-frequency
@@ -592,6 +592,19 @@
 	weighted-frequency CDATA #REQUIRED
 >
 
+<!ELEMENT battery (bat+)>
+<!ATTLIST battery
+	unit CDATA #REQUIRED
+>
+
+<!ELEMENT bat EMPTY>
+<!ATTLIST bat
+	number CDATA #REQUIRED
+	percent-capacity CDATA #REQUIRED
+	variation CDATA #REQUIRED
+	status CDATA #REQUIRED
+>
+
 <!ELEMENT usb-devices (usb+)>
 
 <!ELEMENT usb EMPTY>
diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index 309cd06..2c1f4c9 100644
--- 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 v3.12 for sysstat. See sadf.h --</xs:appinfo>
+	<xs:appinfo>-- XML Schema v3.13 for sysstat. See sadf.h --</xs:appinfo>
 </xs:annotation>
 
 <xs:element name="sysstat" type="sysstat-type"></xs:element>
@@ -657,6 +657,7 @@
 		<xs:element name="temperature" type="temperature-type" minOccurs="0" maxOccurs="1"></xs:element>
 		<xs:element name="voltage-input" type="voltage-input-type" minOccurs="0" maxOccurs="1"></xs:element>
 		<xs:element name="cpu-weighted-frequency" type="cpu-weighted-frequency-type" minOccurs="0" maxOccurs="1"></xs:element>
+		<xs:element name="battery" type="battery-type" minOccurs="0" maxOccurs="1"></xs:element>
 		<xs:element name="usb-devices" type="usb-devices-type" minOccurs="0" maxOccurs="1"></xs:element>
 	</xs:sequence>
 </xs:complexType>
@@ -761,6 +762,28 @@
 	<xs:attribute name="weighted-frequency" type="hundredth-type" use="required"></xs:attribute>
 </xs:complexType>
 
+<xs:element name="battery" type="battery-type"></xs:element>
+<xs:complexType name="battery-type">
+	<xs:sequence>
+		<xs:element name="bat" type="bat-type" minOccurs="1" maxOccurs="unbounded"></xs:element>
+	</xs:sequence>
+	<xs:attribute name="unit" type="batunit-type" use="required"></xs:attribute>
+</xs:complexType>
+
+<xs:element name="bat" type="bat-type"></xs:element>
+<xs:complexType name="bat-type">
+	<xs:attribute name="number" type="xs:nonNegativeInteger" use="required"></xs:attribute>
+	<xs:attribute name="percent-capacity" type="xs:nonNegativeInteger" use="required"></xs:attribute>
+	<xs:attribute name="variation" type="hundredth-type" use="required"></xs:attribute>
+	<xs:attribute name="status" type="xs:string" use="required"></xs:attribute>
+</xs:complexType>
+
+<xs:simpleType name="batunit-type">
+	<xs:restriction base="xs:string">
+		<xs:enumeration value="minute"></xs:enumeration>
+	</xs:restriction>
+</xs:simpleType>
+
 <xs:element name="usb-devices" type="usb-devices-type"></xs:element>
 <xs:complexType name="usb-devices-type">
 	<xs:sequence>