Changeset 4677 for FederatedSearch/examples

Timestamp:

03/12/14 17:08:50 (10 years ago)

Author:

Oliver Schonefeld

Message:

• update Schemas:
  • remove version number from namespace URI (and sanitize them a little)
  • Endpoint Description:
    • change element names <Collection*> to <Resource*>
    • drop <Profile> element
    • add extension points for Endpoint customizations

Location:

FederatedSearch/examples

Files:

• Endpoint-Description-Complex.xml (modified) (5 diffs)
• Endpoint-Description-Simple.xml (modified) (2 diffs)
• Example-Resource-with-Custom-Extension.xml (modified) (2 diffs)
• Example-Resource.xml (modified) (2 diffs)
• Resource-Hit-Multi-Hit.xml (modified) (1 diff)
• Resource-Hit-Single.xml (modified) (1 diff)

FederatedSearch/examples/Endpoint-Description-Complex.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EndpointDescription xmlns="http://clarin.eu/fcs/1.0/endpoint-description"
+<EndpointDescription xmlns="http://clarin.eu/fcs/endpoint-description"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://clarin.eu/fcs/1.0/endpoint-description ../schema/Endpoint-Description.xsd">
-    <Profile>basic</Profile>
+    xsi:schemaLocation="http://clarin.eu/fcs/endpoint-description ../schema/Endpoint-Description.xsd"
+    version="1">
+    <Capabilities>
+        <Capability>http://clarin.eu/fcs/capability/basic-search</Capability>
+    </Capabilities>
     <SupportedDataViews>
-        <SupportedDataView>application/x-clarin-fcs-hits+xml</SupportedDataView>
-        <SupportedDataView>application/x-cmdi+xml</SupportedDataView>
+        <SupportedDataView id="dv1">application/x-clarin-fcs-hits+xml</SupportedDataView>
+        <SupportedDataView id="dv2">application/x-cmdi+xml</SupportedDataView>
     </SupportedDataViews>
-    <Collections>
-        <Collection pid="hdl:10932/goethe">
+    <Resources>
+        <Resource pid="hdl:10932/goethe">
             <Title xml:lang="de">Goethe Corpus</Title>
             <Title xml:lang="en">Goethe Korpus</Title>
@@ -18 +21 @@
                 <Language>deu</Language>
             </Languages>
-        </Collection>
-        <Collection pid="hdl:10932/mannheimer_morgen">
+        </Resource>
+        <Resource pid="hdl:10932/mannheimer_morgen">
             <Title xml:lang="de">Mannheimer Morgen newspaper Corpus</Title>
             <Title xml:lang="en">Zeitungskorpus des Mannheimer Morgen</Title>
@@ -26 +29 @@
                 <Language>deu</Language>
             </Languages>
-            <Collections>
-                <Collection pid="hdl:10932/mannheimer_morgen_before_1990">
+            <Resources>
+                <Resource pid="hdl:10932/mannheimer_morgen_before_1990">
                     <Title xml:lang="de">Mannheimer Morgen newspaper Corpus (before 1990)</Title>
                     <Title xml:lang="en">Zeitungskorpus des Mannheimer Morgen (vor 1990)</Title>
@@ -34 +37 @@
                         <Language>deu</Language>
                     </Languages>
-                </Collection>
-                <Collection pid="hdl:10932/mannheimer_morgen_after_1990">
+                </Resource>
+                <Resource pid="hdl:10932/mannheimer_morgen_after_1990">
                     <Title xml:lang="de">Mannheimer Morgen newspaper Corpus (after 1990)</Title>
                     <Title xml:lang="en">Zeitungskorpus des Mannheimer Morgen (nach 1990)</Title>
@@ -42 +45 @@
                         <Language>deu</Language>
                     </Languages>
-                </Collection>
-            </Collections>
-        </Collection>
-    </Collections>
+                </Resource>
+            </Resources>
+        </Resource>
+    </Resources>
 </EndpointDescription>

FederatedSearch/examples/Endpoint-Description-Simple.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EndpointDescription xmlns="http://clarin.eu/fcs/1.0/endpoint-description"
+<EndpointDescription xmlns="http://clarin.eu/fcs/endpoint-description"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://clarin.eu/fcs/1.0/endpoint-description ../schema/Endpoint-Description.xsd">
-    <Profile>basic</Profile>
+    xsi:schemaLocation="http://clarin.eu/fcs/endpoint-description ../schema/Endpoint-Description.xsd"
+    version="1">
+    <Capabilities>
+        <Capability>http://clarin.eu/fcs/capability/basic-search</Capability>
+        <Capability>http://clarin.eu/fcs/capability/a-b</Capability>
+    </Capabilities>
     <SupportedDataViews>
-        <SupportedDataView>application/x-clarin-fcs-hits+xml</SupportedDataView>
+        <SupportedDataView id="dv1">application/x-clarin-fcs-hits+xml</SupportedDataView>
     </SupportedDataViews>
-    <Collections>
-        <Collection pid="hdl:10932/goethe">
+    <Resources>
+        <Resource pid="hdl:10932/goethe">
             <Title xml:lang="de">Goethe Corpus</Title>
             <Title xml:lang="en">Goethe Korpus</Title>
@@ -17 +21 @@
                 <Language>deu</Language>
             </Languages>
-        </Collection>
-    </Collections>
+        </Resource>
+    </Resources>
 </EndpointDescription>

FederatedSearch/examples/Example-Resource-with-Custom-Extension.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://clarin.eu/fcs/1.0 ../schema/Resource.xsd
-                        http://clarin.eu/fcs/1.0/hits ../schema/DataView-HITS.xsd"
-    xmlns="http://clarin.eu/fcs/1.0"
+    xsi:schemaLocation="http://clarin.eu/fcs/resource ../schema/Resource.xsd
+                        http://clarin.eu/fcs/dataview/hits ../schema/DataView-Hits.xsd"
+    xmlns="http://clarin.eu/fcs/resource"
     pid="hdl:4711/00-0000-0000-0000-0000-0">
     <DataView type="application/x-clarin-fcs-hits+xml"
@@ -11 +11 @@
                   Indention and formatting should be avoided.
         -->
-        <hits:Result xmlns:hits="http://clarin.eu/fcs/1.0/hits">
+        <hits:Result xmlns:hits="http://clarin.eu/fcs/dataview/hits">
             Und so will ich denn hier auch noch anfÃŒhren, daß ich in diesem
             Elend das neckische GelÃŒbde getan: man solle, wenn ich uns

FederatedSearch/examples/Example-Resource.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://clarin.eu/fcs/1.0 ../schema/Resource.xsd
-                        http://clarin.eu/fcs/1.0/hits ../schema/DataView-HITS.xsd"
-    xmlns="http://clarin.eu/fcs/1.0"
+    xsi:schemaLocation="http://clarin.eu/fcs/resource ../schema/Resource.xsd
+                        http://clarin.eu/fcs/dataview/hits ../schema/DataView-Hits.xsd"
+    xmlns="http://clarin.eu/fcs/resource"
     pid="hdl:4711/00-0000-0000-0000-0000-0">
     <DataView type="application/x-clarin-fcs-hits+xml"
@@ -11 +11 @@
                   Indention and formatting should be avoided.
         -->
-        <hits:Result xmlns:hits="http://clarin.eu/fcs/1.0/hits">
+        <hits:Result xmlns:hits="http://clarin.eu/fcs/dataview/hits">
             Und so will ich denn hier auch noch anfÃŒhren, daß ich in diesem
             Elend das neckische GelÃŒbde getan: man solle, wenn ich uns

FederatedSearch/examples/Resource-Hit-Multi-Hit.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Result xmlns="http://clarin.eu/fcs/1.0/hits"
+<Result xmlns="http://clarin.eu/fcs/dataview/hits"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://clarin.eu/fcs/1.0/hits ../schema/Resource-Hits.xsd">
+    xsi:schemaLocation="http://clarin.eu/fcs/dataview/hits ../schema/DataView-Hits.xsd">
     The quick brown <Hit>fox</Hit> jumps over the lazy <Hit>dog</Hit>.
 </Result>

FederatedSearch/examples/Resource-Hit-Single.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Result xmlns="http://clarin.eu/fcs/1.0/hits"
+<Result xmlns="http://clarin.eu/fcs/dataview/hits"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://clarin.eu/fcs/1.0/hits ../schema/Resource-Hits.xsd">
+    xsi:schemaLocation="http://clarin.eu/fcs/dataview/hits ../schema/DataView-Hits.xsd">
     The quick brown <Hit>fox</Hit> jumps over the lazy dog.
 </Result>