From a8bd3a1307a80b8a3801a28ebc64e7411160e023 Mon Sep 17 00:00:00 2001
From: Cyprian Laskowski <cyp@trojina.si>
Date: Wed, 26 Feb 2020 22:46:15 +0100
Subject: [PATCH] IssueID #1102: separated comp from lexeme and added component

---
 .../valency_manual_example.xml                | 24 ++++++++++++-----
 resources/schema/inventory.xsd                | 26 +++++++++++++------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/examples/valency_lexicon/valency_manual_example.xml b/examples/valency_lexicon/valency_manual_example.xml
index 6a89de8..113b96c 100644
--- a/examples/valency_lexicon/valency_manual_example.xml
+++ b/examples/valency_lexicon/valency_manual_example.xml
@@ -71,7 +71,9 @@
                   <semanticRole>AIM</semanticRole>
                   <syntacticStructureList>
                     <syntacticStructure id="36">
-                      <comp num="3">za</comp>
+                      <component num="3">
+                        <lexeme sloleks="">za</lexeme>
+                      </component>
                     </syntacticStructure>
                   </syntacticStructureList>
                 </semanticRoleContainer>
@@ -132,7 +134,9 @@
                   <syntacticStructureList>
                     <syntacticStructure id="8"/>
                     <syntacticStructure id="33">
-                      <comp num="2">z/s</comp>
+                      <component num="2">
+                        <lexeme sloleks="">z/s</lexeme>
+                      </component>
                     </syntacticStructure>
                   </syntacticStructureList>
                 </semanticRoleContainer>
@@ -141,14 +145,22 @@
                   <syntacticStructureList system="JOS">
                     <syntacticStructure id="19"/>
                     <syntacticStructure id="36">
-                      <comp num="3">na</comp>
-                      <comp num="3">pred</comp>
+                      <component num="3">
+                        <lexeme sloleks="">na</lexeme>
+                      </component>
+                      <component num="3">
+                        <lexeme sloleks="">pred</lexeme>
+                      </component>
                     </syntacticStructure>
                     <syntacticStructure id="33">
-                      <comp num="2">z/s</comp>
+                      <component num="2">
+                        <lexeme sloleks="">z/s</lexeme>
+                      </component>
                     </syntacticStructure>
                     <syntacticStructure id="34">
-                      <comp num="3">preko</comp>
+                      <component num="3">
+                        <lexeme sloleks="">preko</lexeme>
+                      </component>
                     </syntacticStructure>
                   </syntacticStructureList>
                 </semanticRoleContainer>
diff --git a/resources/schema/inventory.xsd b/resources/schema/inventory.xsd
index 88b0565..9c7fc46 100644
--- a/resources/schema/inventory.xsd
+++ b/resources/schema/inventory.xsd
@@ -61,13 +61,17 @@
     <xsd:simpleContent>
       <xsd:extension base="xsd:string">
         <xsd:attribute name="lexical_unit_lexeme_id" type="xsd:int"/>
+        <xsd:attribute name="sloleks" type="xsd:string"/>
       </xsd:extension>
     </xsd:simpleContent>
   </xsd:complexType>
 
   <xsd:complexType name="lexicalUnitType">
     <xsd:sequence>
-      <xsd:element name="lexeme" type="lexemeType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:choice>
+        <xsd:element name="lexeme" type="lexemeType"/>
+        <xsd:element name="component" type="componentType" minOccurs="2" maxOccurs="unbounded"/>
+      </xsd:choice>
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:int" use="required"/>
     <xsd:attribute name="type" type="xsd:string" use="required"/>
@@ -182,13 +186,19 @@
     </xsd:simpleContent>
   </xsd:complexType>
 
-  <xsd:complexType name="componentLexemeType">
+  <xsd:complexType name="componentType">
+    <xsd:sequence>
+      <xsd:element name="lexeme" type="lexemeType"/>
+    </xsd:sequence>
+    <xsd:attribute name="structure_id" type="xsd:int"/>
+    <xsd:attribute name="num" type="xsd:int"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="compType">
     <xsd:simpleContent>
       <xsd:extension base="xsd:string">
-        <xsd:attribute name="lexical_unit_lexeme_id" type="xsd:int"/>
         <xsd:attribute name="structure_id" type="xsd:int"/>
         <xsd:attribute name="num" type="xsd:int"/>
-        <xsd:attribute name="lexeme_id" type="xsd:int"/>
         <xsd:attribute name="role">
           <xsd:simpleType>
             <xsd:restriction base="xsd:string">
@@ -206,7 +216,7 @@
 
   <xsd:complexType name="exampleTreeType" mixed="true">
     <xsd:sequence>
-      <xsd:element name="comp" type="componentLexemeType" maxOccurs="unbounded"/>
+      <xsd:element name="comp" type="compType" maxOccurs="unbounded"/>
     </xsd:sequence>
     <xsd:attribute name="role" type="xsd:string"/>
   </xsd:complexType>
@@ -214,7 +224,7 @@
   <xsd:complexType name="corpusExampleType" mixed="true">
     <xsd:sequence>
       <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element name="comp" type="componentLexemeType"/>
+        <xsd:element name="comp" type="compType"/>
         <xsd:element name="tree" type="exampleTreeType"/>
       </xsd:choice>
     </xsd:sequence>
@@ -227,7 +237,7 @@
 
   <xsd:complexType name="multipleLexemeExampleType">
     <xsd:sequence>
-      <xsd:element name="comp" type="componentLexemeType" maxOccurs="unbounded"/>
+      <xsd:element name="comp" type="compType" maxOccurs="unbounded"/>
     </xsd:sequence>
     <xsd:attribute name="type" use="required">
       <xsd:simpleType>
@@ -325,7 +335,7 @@
 
   <xsd:complexType name="syntacticStructureType">
     <xsd:sequence>
-      <xsd:element name="comp" type="componentLexemeType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="component" type="componentType" minOccurs="0" maxOccurs="unbounded"/>
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:int"/>
   </xsd:complexType>