From cb1124b96c6f5fc4061556229b66bb290e2dbb68 Mon Sep 17 00:00:00 2001
From: Martin Killenberg <martin.killenberg@desy.de>
Date: Fri, 4 Aug 2017 10:13:10 +0200
Subject: [PATCH] simple rename xml for testing
---
tests/variableTreeXml/rename.xml | 7 +++++++
tests/variableTreeXml/simpleTree.xml | 13 -------------
xmlschema/doocs_variable_tree.xsd | 29 ++++++++++------------------
3 files changed, 17 insertions(+), 32 deletions(-)
create mode 100644 tests/variableTreeXml/rename.xml
delete mode 100644 tests/variableTreeXml/simpleTree.xml
diff --git a/tests/variableTreeXml/rename.xml b/tests/variableTreeXml/rename.xml
new file mode 100644
index 0000000..8bcbffb
--- /dev/null
+++ b/tests/variableTreeXml/rename.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<device_server xmlns="https://github.com/ChimeraTK/ControlSystemAdapter-DoocsAdapter">
+ <location name="DUMMY_LOCATION">
+ <property source="/A/b/cd/e" name="LOLO"/>
+ <property source="jo" name="yep"/>
+ </location>
+</device_server>
diff --git a/tests/variableTreeXml/simpleTree.xml b/tests/variableTreeXml/simpleTree.xml
deleted file mode 100644
index 28bc38a..0000000
--- a/tests/variableTreeXml/simpleTree.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doocs_variable_tree xmlns="https://github.com/ChimeraTK/ControlSystemAdapter-DoocsAdapter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/ChimeraTK/ControlSystemAdapter-DoocsAdapter doocs_variable_tree.xsd">
- <facility>
- <device>
- <location>
- <property source="A/b/cd/e">
- <has_history/>
- <is_constant/>
- </property>
- </location>
- </device>
- </facility>
-</doocs_variable_tree>
diff --git a/xmlschema/doocs_variable_tree.xsd b/xmlschema/doocs_variable_tree.xsd
index 5531530..12ca838 100644
--- a/xmlschema/doocs_variable_tree.xsd
+++ b/xmlschema/doocs_variable_tree.xsd
@@ -12,36 +12,27 @@
</xs:documentation>
</xs:annotation>
- <xs:element name="doocs_variable_tree" type="DoocsTreeType"/>
-
- <xs:complexType name="DoocsTreeType">
- <xs:sequence>
- <xs:element name="facility" type="FacilityType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="FacilityType">
- <xs:sequence>
- <xs:element name="device" type="DeviceType" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
+ <xs:element name="device_server" type="DeviceType"/>
<xs:complexType name="DeviceType">
<xs:sequence>
- <xs:element name="location" type="LocationType" maxOccurs="unbounded"/>
- </xs:sequence>
+ <xs:element name="location" type="LocationType" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="import" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="LocationType">
<xs:sequence>
- <xs:element name="property" type="PropertyType" maxOccurs="unbounded"/>
+ <xs:element name="property" type="PropertyType" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="import" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
- </xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:complexType>
<xs:complexType name="PropertyType">
<xs:sequence>
- <xs:element name="has_history" type="xs:boolean" default="true"/>
- <xs:element name="is_constant" type="xs:boolean" default="false"/>
+ <xs:element name="has_history" type="xs:boolean" default="true" minOccurs="0"/>
+ <xs:element name="is_writeable" type="xs:boolean" default="true" minOccurs="0"/>
<xs:element name="spectrum" type="SpectrumType" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="source" type="xs:string" use="required"/>
--
GitLab