corrected SRU yazserver setup

diff --git a/examples/oai-pmh/README b/examples/oai-pmh/README
index b9fd521..076bf54 100644 (file)
--- a/examples/oai-pmh/README
+++ b/examples/oai-pmh/README
@@ -247,3 +247,19 @@ SRW scan using implicit server side CQL:
    Notice: you need to use the 'eq' relation for all @attr 4=3 indexes
 
 
+
+
+SRW search using X-PQF query
+
+http://localhost:9999/?version=1.1&operation=searchRetrieve&x-pquery=fish&startRecord=1&maximumRecords=1&recordSchema=dc
+
+http://localhost:9999/?version=1.1&operation=searchRetrieve&x-pquery=fish&startRecord=1&maximumRecords=1&recordSchema=zebra::data
+
+http://localhost:9999/?version=1.1&operation=searchRetrieve&x-pquery=fish&startRecord=1&maximumRecords=1&recordSchema=zebra::meta
+
+http://localhost:9999/?version=1.1&operation=searchRetrieve&x-pquery=fish&startRecord=1&maximumRecords=1&recordSchema=zebra::index::dc_description
+
+http://localhost:9999/?version=1.1&operation=searchRetrieve&x-pquery=fish&startRecord=1&maximumRecords=1&recordSchema=zebra::snippet
+
+http://localhost:9999/?version=1.1&operation=searchRetrieve&x-pquery=fish&startRecord=1&maximumRecords=1&recordSchema=zebra::facet::dc_description:w
+

diff --git a/examples/oai-pmh/conf/dom-conf.xml b/examples/oai-pmh/conf/dom-conf.xml
index bbebfc0..2708265 100644 (file)
--- a/examples/oai-pmh/conf/dom-conf.xml
+++ b/examples/oai-pmh/conf/dom-conf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: dom-conf.xml,v 1.1 2008-02-05 08:24:51 marc Exp $ -->
+<!-- $Id: dom-conf.xml,v 1.2 2008-02-07 13:30:19 marc Exp $ -->
 
 <!-- this file configures the Zebra DOM XML filter -->
 <!-- see: http://www.indexdata.com/zebra/doc/record-model-dom.html -->
@@ -10,30 +10,19 @@
     <xmlreader level="2"/>
   </input>
 
-  <!--  
-  <input syntax="usmarc">
-    <marc inputcharset="marc-8"/>
-  </input>
-  -->
-
   <extract name="index">
     <xslt stylesheet="conf/oai2index.xsl"/>
   </extract>
 
-  <!--
-  <store>
-  </store>
-  -->
-
   <retrieve name="oai">
   </retrieve>
   
-  <retrieve name="zebra">
-    <xslt stylesheet="conf/oai2zebra.xsl"/>
-  </retrieve>
-
   <retrieve name="dc">
     <xslt stylesheet="conf/oai2dc.xsl"/>
   </retrieve>
  
+  <retrieve name="zebra">
+    <xslt stylesheet="conf/oai2zebra.xsl"/>
+  </retrieve>
+ 
  </dom>

diff --git a/examples/oai-pmh/conf/explain.xml b/examples/oai-pmh/conf/explain.xml
index 0568fe7..6f465a8 100644 (file)
--- a/examples/oai-pmh/conf/explain.xml
+++ b/examples/oai-pmh/conf/explain.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- $Id: explain.xml,v 1.1 2008-02-01 09:45:17 marc Exp $ -->
+<!-- $Id: explain.xml,v 1.2 2008-02-07 13:30:19 marc Exp $ -->
 
 <!-- this file configures the SRU/SRW explain response -->
 <!-- see: http://explain.z3950.org/dtd/commentary.html -->
@@ -30,14 +30,14 @@
 
   <databaseInfo>
 
-    <title lang="en" primary="true">OAI record  SRU/SRW/Z39.50 server</title>
+    <title lang="en" primary="true">OAI record SRU/SRW/Z39.50 server</title>
 
     <description lang="en" primary="true">
       OAI harvested article and preprint metadata records 
     </description>
 
     <author>
-      Marc Cromme, Index Data Aps, 
+      Marc Cromme, © Index Data Aps, 
       http://www.indexdata.dk
     </author>
 
@@ -93,14 +93,14 @@
       <title lang="en">CQL Server Choice</title>
       <map><name set="cql">serverChoice</name></map>
       <map>
-        <attr type="1" set="bib1">dc_all</attr>
+        <attr type="1" set="bib1">any</attr>
       </map>
     </index>
     <index search="true" scan="true" sort="false">
       <title lang="en">CQL All</title>
       <map><name set="cql">all</name></map>
       <map>
-        <attr type="1" set="bib1">dc_all</attr>
+        <attr type="1" set="bib1">any</attr>
       </map>
     </index>
 
@@ -109,7 +109,7 @@
       <title lang="en">Record ID</title>
       <map><name set="rec">id</name></map>
       <map>
-        <attr type="1" set="bib1">rec:id</attr>
+        <attr type="1" set="bib1">oai_identifier</attr>
         <attr type="4" set="bib1">3</attr>
       </map>
     </index>
@@ -241,6 +241,14 @@
         <attr type="4" set="bib1">3</attr>
       </map>
     </index>
+    <index search="true" scan="true" sort="false">
+      <title lang="en">DC Source</title>
+      <map><name set="dc">source</name></map>
+      <map>
+        <attr type="1" set="bib1">dc_source</attr>
+        <attr type="4" set="bib1">3</attr>
+      </map>
+    </index>
     <!--
     <index search="true" scan="true" sort="false">
       <title lang="en">DC Coverage</title>
@@ -272,23 +280,16 @@
 
     <schema identifier="http://indexdata.dk/dc-short"
             location="" 
-            name="oai"
+            name="zebra::data"
             retrieve="true">
       <title lang="en">Open Archives Initiative</title>
     </schema>
 
     <schema identifier="http://indexdata.dk/zebra/xslt/retrieve"
             location="" 
-            name="zebra"
-            retrieve="true">
-      <title lang="en">Zebra Retrieve</title>
-    </schema>
-
-    <schema identifier="http://indexdata.dk/zebra/xslt/1"
-            location="" 
-            name="index"
+            name="zebra::meta"
             retrieve="true">
-      <title lang="en">Zebra Indexing</title>
+      <title lang="en">Zebra Meta</title>
     </schema>
 
   </schemaInfo>

diff --git a/examples/oai-pmh/conf/yazserver.xml b/examples/oai-pmh/conf/yazserver.xml
index a37e4c7..d4fd6ad 100644 (file)
--- a/examples/oai-pmh/conf/yazserver.xml
+++ b/examples/oai-pmh/conf/yazserver.xml
@@ -23,7 +23,7 @@
     
     <!-- explain message - send in SRW Explain
          - yes, we understand Z39.50 and SRW on the same port !! -->
-    <xi:include href="conf/explain.xml"
+    <xi:include href="explain.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude">
       <xi:fallback>
         <explain xmlns="http://explain.z3950.org/dtd/2.0/">

diff --git a/examples/oai-pmh/data/fetch_OAI_data.sh b/examples/oai-pmh/data/fetch_OAI_data.sh
index 93e16f5..85c693c 100755 (executable)
--- a/examples/oai-pmh/data/fetch_OAI_data.sh
+++ b/examples/oai-pmh/data/fetch_OAI_data.sh
@@ -403,7 +403,8 @@ http://libserv12.Princeton.EDU/oai/oai.pl \
 http://www.tdx.cesca.es/TDX_UOC/NDLTD-OAI/oai.pl \
 http://arXiv.org/oai2 \
 http://www.pubmedcentral.gov/oai/oai.cgi \
-http://dataprovider.ibict.br/mypoai/oai2.php"
+http://dataprovider.ibict.br/mypoai/oai2.php \
+http://quod.lib.umich.edu/cgi/o/oai/oai"
 
 
 for BASE_OAI_URL in $BASE_OAI_URLS ;