From 9bf9a696f6553e1fef092b287ba59bfc7fa692ac Mon Sep 17 00:00:00 2001
From: Cyprian Laskowski <cyp@cjvt.si>
Date: Wed, 26 Jul 2023 16:00:16 +0200
Subject: [PATCH] Redmine #1461: changed system type from element to attribute

---
 resources/schema/structures.xsd | 80 +++++++++++++++------------------
 1 file changed, 37 insertions(+), 43 deletions(-)

diff --git a/resources/schema/structures.xsd b/resources/schema/structures.xsd
index 1112e11..73deaf9 100644
--- a/resources/schema/structures.xsd
+++ b/resources/schema/structures.xsd
@@ -271,59 +271,46 @@
         <xsd:element name="syntactic_structure" minOccurs="0" maxOccurs="unbounded">
           <xsd:complexType>
             <xsd:sequence>
-              <xsd:element name="system">
+              <xsd:element name="components">
                 <xsd:complexType>
                   <xsd:sequence>
-                    <xsd:element name="components">
-                      <xsd:complexType>
-                        <xsd:sequence>
-                          <xsd:element name="component" type="componentsComponentType" minOccurs="0" maxOccurs="unbounded"/>
-                        </xsd:sequence>
-                        <xsd:attribute name="order" use="required">
-                          <xsd:simpleType>
-                            <xsd:restriction base="xsd:string">
-                              <xsd:enumeration value="fixed"/>
-                              <xsd:enumeration value="variable"/>
-                            </xsd:restriction>
-                          </xsd:simpleType>
-                        </xsd:attribute>
-                      </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="dependencies">
-                      <xsd:complexType>
-                        <xsd:sequence>
-                          <xsd:element name="dependency" type="dependencyType" minOccurs="0" maxOccurs="unbounded"/>
-                        </xsd:sequence>
-                      </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="definition">
-                      <xsd:complexType>
-                        <xsd:sequence>
-                          <xsd:element name="component" minOccurs="0" maxOccurs="unbounded">
-                            <xsd:complexType>
-                              <xsd:sequence>
-                                <xsd:choice minOccurs="0">
-                                  <xsd:element name="restriction" type="restrictionType" maxOccurs="unbounded"/>
-                                  <xsd:element name="restriction_or" type="restrictionOrType" maxOccurs="unbounded"/>
-                                </xsd:choice>
-                                <xsd:element name="representation" type="representationType" minOccurs="0" maxOccurs="unbounded"/>
-                              </xsd:sequence>
-                              <xsd:attribute name="cid" type="xsd:integer"/>
-                            </xsd:complexType>
-                          </xsd:element>
-                        </xsd:sequence>
-                      </xsd:complexType>
-                    </xsd:element>
+                    <xsd:element name="component" type="componentsComponentType" minOccurs="0" maxOccurs="unbounded"/>
                   </xsd:sequence>
-                  <xsd:attribute name="type" use="required">
+                  <xsd:attribute name="order" use="required">
                     <xsd:simpleType>
                       <xsd:restriction base="xsd:string">
-                        <xsd:enumeration value="JOS"/>
+                        <xsd:enumeration value="fixed"/>
+                        <xsd:enumeration value="variable"/>
                       </xsd:restriction>
                     </xsd:simpleType>
                   </xsd:attribute>
                 </xsd:complexType>
               </xsd:element>
+              <xsd:element name="dependencies">
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="dependency" type="dependencyType" minOccurs="0" maxOccurs="unbounded"/>
+                  </xsd:sequence>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="definition">
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="component" minOccurs="0" maxOccurs="unbounded">
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:choice minOccurs="0">
+                            <xsd:element name="restriction" type="restrictionType" maxOccurs="unbounded"/>
+                            <xsd:element name="restriction_or" type="restrictionOrType" maxOccurs="unbounded"/>
+                          </xsd:choice>
+                          <xsd:element name="representation" type="representationType" minOccurs="0" maxOccurs="unbounded"/>
+                        </xsd:sequence>
+                        <xsd:attribute name="cid" type="xsd:integer"/>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                </xsd:complexType>
+              </xsd:element>
             </xsd:sequence>
             <xsd:attribute name="id" type="xsd:integer"/>
             <xsd:attribute name="parent_id" type="xsd:integer"/>
@@ -343,6 +330,13 @@
           </xsd:complexType>
         </xsd:element>
       </xsd:sequence>
+      <xsd:attribute name="system_type" use="required">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="JOS"/>
+          </xsd:restriction>
+        </xsd:simpleType>
+      </xsd:attribute>
     </xsd:complexType>
   </xsd:element>