Commit 50d65407 authored by ankraft's avatar ankraft

<data> element in event is now optional

parent c2394d92
...@@ -35,15 +35,6 @@ Domain = ...@@ -35,15 +35,6 @@ Domain =
}* }*
}? }?
} }
DeviceInfos =
element DeviceInfos {
element DeviceInfo {
attribute name { text },
attribute optional { xsd:boolean }?,
DocDef,
DataTypeDef
}*
}
Characteristics = Characteristics =
element Characteristics { element Characteristics {
element Characteristic { element Characteristic {
...@@ -155,6 +146,6 @@ Events = ...@@ -155,6 +146,6 @@ Events =
attribute name { text }, attribute name { text },
attribute optional { xsd:boolean }?, attribute optional { xsd:boolean }?,
DocDef, DocDef,
Data Data?
}* }*
} }
...@@ -357,7 +357,9 @@ ...@@ -357,7 +357,9 @@
</attribute> </attribute>
</optional> </optional>
<ref name="DocDef"/> <ref name="DocDef"/>
<ref name="Data" /> <optional>
<ref name="Data" />
</optional>
</element> </element>
</zeroOrMore> </zeroOrMore>
</element> </element>
......
...@@ -66,24 +66,6 @@ ...@@ -66,24 +66,6 @@
<xs:attribute name="id" use="required" type="xs:Name"/> <xs:attribute name="id" use="required" type="xs:Name"/>
</xs:complexType> </xs:complexType>
</xs:element> </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:element name="Characteristics">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
...@@ -283,7 +265,7 @@ ...@@ -283,7 +265,7 @@
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:group ref="DocDef"/> <xs:group ref="DocDef"/>
<xs:element ref="Data"/> <xs:element minOccurs="0" ref="Data"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="name" use="required"/> <xs:attribute name="name" use="required"/>
<xs:attribute name="optional" type="xs:boolean"/> <xs:attribute name="optional" type="xs:boolean"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment