Changeset 5383 for DASISH


Ignore:
Timestamp:
06/24/14 15:36:15 (10 years ago)
Author:
olhsha@mpi.nl
Message:

ref --> href
+ xml:id for instances

File:
1 edited

Legend:

Unmodified
Added
Removed

  • DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd

    r4917 r5383  
    99        <xs:sequence/>
    1010    </xs:complexType>
    11 
     11   
     12 
    1213    <xs:complexType name="ReferenceList">
    1314        <xs:complexContent>
    1415            <xs:extension base="dasish:List">
    15                 <xs:sequence>
    16                     <xs:element name="ref" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
     16                <xs:sequence>                   
     17                    <xs:element name="href" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
    1718                </xs:sequence>
    1819            </xs:extension>
    … …  
    2728            <xs:element name="type" type="xs:string" minOccurs="1" maxOccurs="1"/>
    2829        </xs:sequence>
    29         <xs:attribute name="URI" type="xs:anyURI" use="required"/>
     30        <xs:attribute name="href" type="xs:anyURI" use="required"/>
     31        <xs:attribute ref="xml:id" use="required"/>
    3032    </xs:complexType>
    3133
    … …  
    3537            <xs:element name="fragmentString" type="xs:string" minOccurs="1" maxOccurs="1"/>
    3638        </xs:sequence>
    37         <xs:attribute name="ref" type="xs:anyURI" use="required"/>
     39        <xs:attribute name="href" type="xs:anyURI" use="required"/>
    3840    </xs:complexType>
    3941   
    … …  
    5860                minOccurs="1"/>
    5961        </xs:sequence>
    60         <xs:attribute name="URI" type="xs:anyURI" use="required"/>
     62        <xs:attribute name="href" type="xs:anyURI" use="required"/>
     63        <xs:attribute ref="xml:id" use="required"/>
    6164    </xs:complexType>
    6265
    … …  
    6770            <xs:element name="version" type="xs:string" minOccurs="1" maxOccurs="1"/>
    6871        </xs:sequence>       
    69         <xs:attribute name="ref" type="xs:anyURI" use="required"/>
     72        <xs:attribute name="href" type="xs:anyURI" use="required"/>
    7073    </xs:complexType>
    7174
    … …  
    8790            <xs:element name="eMail" type="xs:string" minOccurs="1" maxOccurs="1"/>   
    8891        </xs:sequence>
    89         <xs:attribute name="URI" type="xs:anyURI" use="required"/>   
     92        <xs:attribute name="href" type="xs:anyURI" use="required"/>
     93        <xs:attribute ref="xml:id" use="required"/>   
    9094    </xs:complexType>
    9195
    … …  
    9599            <xs:element name="currentPrincipal" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
    96100        </xs:sequence>
    97         <xs:attribute name="ref" type="xs:anyURI" use="required"/>
     101        <xs:attribute name="href" type="xs:anyURI" use="required"/>
    98102    </xs:complexType>
    99103
    … …  
    118122
    119123    <xs:complexType name="Permission">
    120         <xs:attribute name="principalRef" type="xs:anyURI" use="required"/>
     124        <xs:attribute name="principalHref" type="xs:anyURI" use="required"/>
    121125        <xs:attribute name="level" type="dasish:Access" use="required"/>
    122126    </xs:complexType>
    … …  
    137141    <xs:complexType name="Annotation">
    138142        <xs:sequence>           
     143            <xs:element name="ownerHref" type="xs:anyURI"  minOccurs="1" maxOccurs="1"/>           
    139144            <xs:element name="headline" type="xs:string"  minOccurs="1" maxOccurs="1"/>
    140145            <xs:element name="lastModified" type="xs:dateTime"  minOccurs="1" maxOccurs="1"/>
    … …  
    144149                        maxOccurs="1"/>
    145150        </xs:sequence>
    146         <xs:attribute name="URI" type="xs:anyURI" use="required"/>
    147         <xs:attribute name="ownerRef" type="xs:anyURI" use="required"/>
     151        <xs:attribute name="href" type="xs:anyURI" use="required"/>
     152        <xs:attribute ref="xml:id" use="required"/>
    148153    </xs:complexType>
    149154
    150155
    151156    <xs:complexType name="AnnotationInfo">
    152         <xs:sequence>           
     157        <xs:sequence>
     158            <xs:element name="ownerHref" type="xs:anyURI"  minOccurs="1" maxOccurs="1"/>                 
    153159            <xs:element name="headline" type="xs:string"  minOccurs="1" maxOccurs="1"/>
    154160            <xs:element name="lastModified" type="xs:dateTime"  minOccurs="1" maxOccurs="1"/>
    … …  
    156162            />
    157163        </xs:sequence>
    158         <xs:attribute name="ref" type="xs:anyURI" use="required"/>
    159         <xs:attribute name="ownerRef" type="xs:anyURI" use="required"/>
     164        <xs:attribute name="href" type="xs:anyURI" use="required"/>
    160165    </xs:complexType>
    161166
    … …  
    194199
    195200    <xs:complexType name="Notebook">
    196         <xs:sequence>             
     201        <xs:sequence>
     202            <xs:element name="ownerRef" type="xs:anyURI"  minOccurs="1" maxOccurs="1"/>
    197203            <xs:element name="title" type="xs:string" minOccurs="1" maxOccurs="1"/>
    198204            <xs:element name="lastModified" type="xs:dateTime" minOccurs="1" maxOccurs="1"/>
    … …  
    201207                        maxOccurs="1"/>
    202208        </xs:sequence>
    203         <xs:attribute name="URI" type="xs:anyURI" use="required"/>
    204         <xs:attribute name="ownerRef" type="xs:anyURI" use="required"/>
     209        <xs:attribute name="href" type="xs:anyURI" use="required"/>
     210        <xs:attribute ref="xml:id" use="required"/>
    205211    </xs:complexType>
    206212
    207213
    208214    <xs:complexType name="NotebookInfo">
    209         <xs:sequence>             
     215        <xs:sequence>
     216            <xs:element name="ownerHref" type="xs:anyURI"  minOccurs="1" maxOccurs="1"/>             
    210217            <xs:element name="title" type="xs:string" minOccurs="1" maxOccurs="1"/>           
    211218        </xs:sequence>
    212         <xs:attribute name="ref" type="xs:anyURI" use="required"/>
    213         <xs:attribute name="ownerRef" type="xs:anyURI" use="required"/>
     219        <xs:attribute name="href" type="xs:anyURI" use="required"/>
    214220    </xs:complexType>
    215221
    … …  
    334340
    335341    <xs:element name="currentPrincipalInfoList" type="dasish:CurrentPrincipalInfoList"/>
    336 
     342       
    337343    <xs:element name="principalList" type="dasish:ReferenceList"/>
    338344       
Note: See TracChangeset for help on using the changeset viewer.