From 50d654077d872219d322ce0784c6d755ded73466 Mon Sep 17 00:00:00 2001
From: ankraft <an.kraft@googlemail.com>
Date: Tue, 6 Oct 2015 17:04:16 +0200
Subject: [PATCH] <data> element in event is now optional
---
SDT/schema3.0/etc/domain.rnc | 11 +----------
SDT/schema3.0/src/domain.rng | 4 +++-
SDT/schema3.0/src/domain.xsd | 20 +-------------------
3 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/SDT/schema3.0/etc/domain.rnc b/SDT/schema3.0/etc/domain.rnc
index 0d15caa..d0e0df4 100644
--- a/SDT/schema3.0/etc/domain.rnc
+++ b/SDT/schema3.0/etc/domain.rnc
@@ -35,15 +35,6 @@ Domain =
}*
}?
}
-DeviceInfos =
- element DeviceInfos {
- element DeviceInfo {
- attribute name { text },
- attribute optional { xsd:boolean }?,
- DocDef,
- DataTypeDef
- }*
- }
Characteristics =
element Characteristics {
element Characteristic {
@@ -155,6 +146,6 @@ Events =
attribute name { text },
attribute optional { xsd:boolean }?,
DocDef,
- Data
+ Data?
}*
}
diff --git a/SDT/schema3.0/src/domain.rng b/SDT/schema3.0/src/domain.rng
index df7d6c8..9b0b66f 100644
--- a/SDT/schema3.0/src/domain.rng
+++ b/SDT/schema3.0/src/domain.rng
@@ -357,7 +357,9 @@
</attribute>
</optional>
<ref name="DocDef"/>
- <ref name="Data" />
+ <optional>
+ <ref name="Data" />
+ </optional>
</element>
</zeroOrMore>
</element>
diff --git a/SDT/schema3.0/src/domain.xsd b/SDT/schema3.0/src/domain.xsd
index 01e69d3..55e3a19 100644
--- a/SDT/schema3.0/src/domain.xsd
+++ b/SDT/schema3.0/src/domain.xsd
@@ -66,24 +66,6 @@
<xs:attribute name="id" use="required" type="xs:Name"/>
</xs:complexType>
</xs:element>
- <xs:element name="DeviceInfos">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="DeviceInfo"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="DeviceInfo">
- <xs:complexType>
- <xs:sequence>
- <xs:group ref="DocDef"/>
- <xs:element ref="DataTypeDef"/>
- </xs:sequence>
- <xs:attribute name="name" use="required"/>
- <xs:attribute name="optional" type="xs:boolean"/>
- <xs:attributeGroup ref="DataTypeDef"/>
- </xs:complexType>
- </xs:element>
<xs:element name="Characteristics">
<xs:complexType>
<xs:sequence>
@@ -283,7 +265,7 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="DocDef"/>
- <xs:element ref="Data"/>
+ <xs:element minOccurs="0" ref="Data"/>
</xs:sequence>
<xs:attribute name="name" use="required"/>
<xs:attribute name="optional" type="xs:boolean"/>
--
GitLab