From f9bc468040d16c0601514b873916ac0c72406bd6 Mon Sep 17 00:00:00 2001
From: Lamar Moore <lamar.moore@stfc.ac.uk>
Date: Fri, 8 Nov 2019 09:48:25 +0000
Subject: [PATCH] Update facilities xml schema #26702
---
.../Schema/Facilities/1.0/FacilitiesSchema.xsd | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/instrument/Schema/Facilities/1.0/FacilitiesSchema.xsd b/instrument/Schema/Facilities/1.0/FacilitiesSchema.xsd
index 0e295e00c3e..e228526de4e 100644
--- a/instrument/Schema/Facilities/1.0/FacilitiesSchema.xsd
+++ b/instrument/Schema/Facilities/1.0/FacilitiesSchema.xsd
@@ -87,7 +87,7 @@
<xs:element name="technique" maxOccurs="unbounded" type="xs:string"/>
<xs:element name="livedata">
<xs:complexType>
- <xs:choice>
+ <xs:sequence>
<xs:element name="connection" minOccurs="1" maxOccurs="unbounded">
<xs:complexType>
<xs:attribute name="name" type="xs:string" use="required"/>
@@ -95,21 +95,13 @@
<xs:attribute name="listener" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
- <xs:element name="choppertopic" type="topicType" maxOccurs="unbounded" />
+ <xs:element name="topic" minOccurs="0" maxOccurs="unbounded" >
<xs:complexType>
<xs:attribute name="name" type="xs:string" use="required" />
+ <xs:attribute name="type" type="xs:string" use="required" />
</xs:complexType>
- <xs:simpleType name="topicType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="event" />
- <xs:enumeration value="chopper" />
- <xs:enumeration value="sample" />
- <xs:enumeration value="run" />
- <xs:enumeration value="monitor" />
- </xs:restriction>
- </xs:simpleType>
</xs:element>
- </xs:choice>
+ </xs:sequence>
<xs:attribute name="default" type="xs:string" use="optional"/>
</xs:complexType>
</xs:element>
--
GitLab