From 8a2c68652225e62fd0b361228dcb90c1c97a97a6 Mon Sep 17 00:00:00 2001
From: Andreas Kraft <akr@cerebus.fritz.box>
Date: Mon, 27 Apr 2015 15:20:50 +0200
Subject: [PATCH] Fixed Event definition: - Added Data - Added Doc Added test
for Event in dal-eg.xml
---
SDT/schema/etc/domain.rnc | 4 +++-
SDT/schema/src/domain.rng | 2 ++
SDT/schema/src/domain.xsd | 4 ++++
SDT/schema/test/dal-eg.xml | 11 +++++++++++
4 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/SDT/schema/etc/domain.rnc b/SDT/schema/etc/domain.rnc
index 3bb4e2e..3e9e3f4 100644
--- a/SDT/schema/etc/domain.rnc
+++ b/SDT/schema/etc/domain.rnc
@@ -83,7 +83,9 @@ Data =
Events =
element Events {
element Event {
- attribute name { text }
+ attribute name { text },
+ Data,
+ Doc
}*
}
#
diff --git a/SDT/schema/src/domain.rng b/SDT/schema/src/domain.rng
index ecf4fc7..d43e63b 100644
--- a/SDT/schema/src/domain.rng
+++ b/SDT/schema/src/domain.rng
@@ -215,6 +215,8 @@
<attribute name="name">
<text/>
</attribute>
+ <ref name="Data" />
+ <ref name="Doc"/>
</element>
</zeroOrMore>
</element>
diff --git a/SDT/schema/src/domain.xsd b/SDT/schema/src/domain.xsd
index fe3ea3f..b68c0d2 100644
--- a/SDT/schema/src/domain.xsd
+++ b/SDT/schema/src/domain.xsd
@@ -182,6 +182,10 @@
</xs:element>
<xs:element name="Event">
<xs:complexType>
+ <xs:sequence>
+ <xs:element ref="Data"/>
+ <xs:group ref="Doc"/>
+ </xs:sequence>
<xs:attribute name="name" use="required"/>
</xs:complexType>
</xs:element>
diff --git a/SDT/schema/test/dal-eg.xml b/SDT/schema/test/dal-eg.xml
index 81603e8..4e17066 100644
--- a/SDT/schema/test/dal-eg.xml
+++ b/SDT/schema/test/dal-eg.xml
@@ -54,6 +54,17 @@
</Doc>
</Action>
</Actions>
+
+ <Events>
+ <Event name="switchEvent">
+ <Data>
+ <DataPoint name="state" type="boolean" writable="false">
+ </DataPoint>
+ </Data>
+ <Doc>An event that indicates the new state of the switch.
+ </Doc>
+ </Event>
+ </Events>
</Module>
<Module name="power">
--
GitLab