Changeset 1498 for FederatedSearch


Ignore:
Timestamp:
08/29/11 13:00:32 (13 years ago)
Author:
vronk
Message:
  1. <ccs:Resource>-element is recursive
  2. <ccs:Metadata>-element is dropped in favour of <ccs:DataView type="metadata" >;
  3. New attribute: @schema on element <ccs:DataView> ;
  4. Attributes @pid and @ref on any element;
File:
1 edited

Legend:

Unmodified
Added
Removed

  • FederatedSearch/ccsResource.xsd

    r1430 r1498  
    1919    </xs:annotation>
    2020
    21     <xs:element name="Resouce">
    22         <xs:complexType>
    23             <xs:sequence>
    24                 <xs:element maxOccurs="unbounded" minOccurs="0" name="Metadata"
    25                     type="ccs:MetadataType"/>
    26                 <xs:element maxOccurs="unbounded" minOccurs="0" name="ResourceFragment"
    27                     type="ccs:ResourceFragmentType"/>
    28                 <xs:element maxOccurs="unbounded" minOccurs="0" name="DataView"
    29                     type="ccs:DataViewType"/>
    30             </xs:sequence>
    31             <xs:attribute name="pid" type="ccs:pidType" use="optional"/>
    32             <xs:attribute name="ref" type="ccs:refType" use="optional"/>
    33         </xs:complexType>
    34 
    35     </xs:element>
     21    <xs:element name="Resource" type="ccs:ResourceType"> </xs:element>
     22    <xs:complexType name="ResourceType">
     23        <xs:sequence>
     24            <xs:element maxOccurs="unbounded" minOccurs="0" name="Resource" type="ccs:ResourceType"/>
     25            <xs:element maxOccurs="unbounded" minOccurs="0" name="DataView" type="ccs:DataViewType"/>
     26            <xs:element maxOccurs="unbounded" minOccurs="0" name="ResourceFragment"
     27                type="ccs:ResourceFragmentType"/>
     28        </xs:sequence>
     29        <xs:attribute name="pid" type="ccs:pidType" use="optional"/>
     30        <xs:attribute name="ref" type="ccs:refType" use="optional"/>
     31    </xs:complexType>
    3632
    3733
    3834    <xs:complexType name="ResourceFragmentType">
    3935        <xs:sequence>
    40             <xs:element maxOccurs="unbounded" minOccurs="0" name="Metadata" type="ccs:MetadataType"/>
    4136            <xs:element maxOccurs="unbounded" minOccurs="0" name="DataView" type="ccs:DataViewType"
    4237            />
    … …  
    4641    </xs:complexType>
    4742
    48 
    49     <xs:complexType name="MetadataType">
    50         <xs:annotation>
    51             <xs:documentation>Taken from oai-pmh:
    52                 Metadata must be expressed in XML that complies
    53                 with another XML Schema (namespace=#other). Metadata must be
    54                 explicitly qualified in the response.
    55                 So this could be dublincore, OAI_DC, MODS, OLAC or whatever.
    56             </xs:documentation>
    57         </xs:annotation>
    58         <xs:sequence>
    59             <xs:any namespace="##other" processContents="strict"/>
    60         </xs:sequence>
    61         <xs:attribute name="pid" type="ccs:pidType" use="optional"/>
    62         <xs:attribute name="ref" type="ccs:refType" use="optional"/>
    63     </xs:complexType>
    64 
    6543    <xs:complexType name="DataViewType">
    6644        <xs:annotation>
    67             <xs:documentation>the content expressed in XML that complies
    68                 with another XML Schema (namespace=#other). Analogous to metadataType.</xs:documentation>
     45            <xs:documentation>the content expressed in XML that complies with another XML Schema (namespace=#other). </xs:documentation>
    6946        </xs:annotation>
    7047        <xs:sequence>
    … …  
    7451        <xs:attribute name="pid" type="ccs:pidType"/>
    7552        <xs:attribute name="ref" type="ccs:refType"/>
     53        <xs:attribute name="schema" type="ccs:schemaType"/>
    7654    </xs:complexType>
    7755
    … …  
    8058            <xs:documentation>This is obviously not exhaustive.
    8159
    82 Shouldn't this be MIME-type ?</xs:documentation>
     60Could this be a superset of of MIME-type?</xs:documentation>
    8361        </xs:annotation>
    8462        <xs:restriction base="xs:string">
    … …  
    10482
    10583
     84    <xs:simpleType name="schemaType">
     85        <xs:annotation>
     86            <xs:documentation>a reference to a schema, describing the content of the DataView</xs:documentation>
     87        </xs:annotation>
     88        <xs:restriction base="xs:anyURI"/>
     89    </xs:simpleType>
    10690</xs:schema>
Note: See TracChangeset for help on using the changeset viewer.