IssueID #1102: separated comp from lexeme and added component

This commit is contained in:
Cyprian Laskowski 2020-02-26 22:46:15 +01:00
parent f489418888
commit a8bd3a1307
2 changed files with 36 additions and 14 deletions

View File

@ -71,7 +71,9 @@
<semanticRole>AIM</semanticRole> <semanticRole>AIM</semanticRole>
<syntacticStructureList> <syntacticStructureList>
<syntacticStructure id="36"> <syntacticStructure id="36">
<comp num="3">za</comp> <component num="3">
<lexeme sloleks="">za</lexeme>
</component>
</syntacticStructure> </syntacticStructure>
</syntacticStructureList> </syntacticStructureList>
</semanticRoleContainer> </semanticRoleContainer>
@ -132,7 +134,9 @@
<syntacticStructureList> <syntacticStructureList>
<syntacticStructure id="8"/> <syntacticStructure id="8"/>
<syntacticStructure id="33"> <syntacticStructure id="33">
<comp num="2">z/s</comp> <component num="2">
<lexeme sloleks="">z/s</lexeme>
</component>
</syntacticStructure> </syntacticStructure>
</syntacticStructureList> </syntacticStructureList>
</semanticRoleContainer> </semanticRoleContainer>
@ -141,14 +145,22 @@
<syntacticStructureList system="JOS"> <syntacticStructureList system="JOS">
<syntacticStructure id="19"/> <syntacticStructure id="19"/>
<syntacticStructure id="36"> <syntacticStructure id="36">
<comp num="3">na</comp> <component num="3">
<comp num="3">pred</comp> <lexeme sloleks="">na</lexeme>
</component>
<component num="3">
<lexeme sloleks="">pred</lexeme>
</component>
</syntacticStructure> </syntacticStructure>
<syntacticStructure id="33"> <syntacticStructure id="33">
<comp num="2">z/s</comp> <component num="2">
<lexeme sloleks="">z/s</lexeme>
</component>
</syntacticStructure> </syntacticStructure>
<syntacticStructure id="34"> <syntacticStructure id="34">
<comp num="3">preko</comp> <component num="3">
<lexeme sloleks="">preko</lexeme>
</component>
</syntacticStructure> </syntacticStructure>
</syntacticStructureList> </syntacticStructureList>
</semanticRoleContainer> </semanticRoleContainer>

View File

@ -61,13 +61,17 @@
<xsd:simpleContent> <xsd:simpleContent>
<xsd:extension base="xsd:string"> <xsd:extension base="xsd:string">
<xsd:attribute name="lexical_unit_lexeme_id" type="xsd:int"/> <xsd:attribute name="lexical_unit_lexeme_id" type="xsd:int"/>
<xsd:attribute name="sloleks" type="xsd:string"/>
</xsd:extension> </xsd:extension>
</xsd:simpleContent> </xsd:simpleContent>
</xsd:complexType> </xsd:complexType>
<xsd:complexType name="lexicalUnitType"> <xsd:complexType name="lexicalUnitType">
<xsd:sequence> <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:sequence>
<xsd:attribute name="id" type="xsd:int" use="required"/> <xsd:attribute name="id" type="xsd:int" use="required"/>
<xsd:attribute name="type" type="xsd:string" use="required"/> <xsd:attribute name="type" type="xsd:string" use="required"/>
@ -182,13 +186,19 @@
</xsd:simpleContent> </xsd:simpleContent>
</xsd:complexType> </xsd:complexType>
<xsd:complexType name="componentLexemeType"> <xsd:complexType name="componentType">
<xsd:simpleContent> <xsd:sequence>
<xsd:extension base="xsd:string"> <xsd:element name="lexeme" type="lexemeType"/>
<xsd:attribute name="lexical_unit_lexeme_id" type="xsd:int"/> </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="structure_id" type="xsd:int"/> <xsd:attribute name="structure_id" type="xsd:int"/>
<xsd:attribute name="num" type="xsd:int"/> <xsd:attribute name="num" type="xsd:int"/>
<xsd:attribute name="lexeme_id" type="xsd:int"/>
<xsd:attribute name="role"> <xsd:attribute name="role">
<xsd:simpleType> <xsd:simpleType>
<xsd:restriction base="xsd:string"> <xsd:restriction base="xsd:string">
@ -206,7 +216,7 @@
<xsd:complexType name="exampleTreeType" mixed="true"> <xsd:complexType name="exampleTreeType" mixed="true">
<xsd:sequence> <xsd:sequence>
<xsd:element name="comp" type="componentLexemeType" maxOccurs="unbounded"/> <xsd:element name="comp" type="compType" maxOccurs="unbounded"/>
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="role" type="xsd:string"/> <xsd:attribute name="role" type="xsd:string"/>
</xsd:complexType> </xsd:complexType>
@ -214,7 +224,7 @@
<xsd:complexType name="corpusExampleType" mixed="true"> <xsd:complexType name="corpusExampleType" mixed="true">
<xsd:sequence> <xsd:sequence>
<xsd:choice minOccurs="0" maxOccurs="unbounded"> <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:element name="tree" type="exampleTreeType"/>
</xsd:choice> </xsd:choice>
</xsd:sequence> </xsd:sequence>
@ -227,7 +237,7 @@
<xsd:complexType name="multipleLexemeExampleType"> <xsd:complexType name="multipleLexemeExampleType">
<xsd:sequence> <xsd:sequence>
<xsd:element name="comp" type="componentLexemeType" maxOccurs="unbounded"/> <xsd:element name="comp" type="compType" maxOccurs="unbounded"/>
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="type" use="required"> <xsd:attribute name="type" use="required">
<xsd:simpleType> <xsd:simpleType>
@ -325,7 +335,7 @@
<xsd:complexType name="syntacticStructureType"> <xsd:complexType name="syntacticStructureType">
<xsd:sequence> <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:sequence>
<xsd:attribute name="id" type="xsd:int"/> <xsd:attribute name="id" type="xsd:int"/>
</xsd:complexType> </xsd:complexType>