Updated the files to handle oai_dc namespaces for the record meta-data.

diff --git a/examples/oai-pmh/conf/oai2dc.xsl b/examples/oai-pmh/conf/oai2dc.xsl
index 0226c9c..299a52b 100644 (file)
--- a/examples/oai-pmh/conf/oai2dc.xsl
+++ b/examples/oai-pmh/conf/oai2dc.xsl
@@ -23,39 +23,48 @@
   </xsl:template>
   -->
 
   </xsl:template>
   -->
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:date">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:date
+  | oai:record/oai:metadata/oai_dc:dc/oai_dc:date">

       <dc:date><xsl:value-of select="."/></dc:date>
   </xsl:template>
 
       <dc:date><xsl:value-of select="."/></dc:date>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:description">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:description
+  | oai:record/oai:metadata/oai_dc:dc/oai_dc:description">

       <dc:description><xsl:value-of select="."/></dc:description>
   </xsl:template>
 
       <dc:description><xsl:value-of select="."/></dc:description>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/format">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:format
+  | oai:record/oai:metadata/oai_dc:dc/oai_dc:format">

       <format><xsl:value-of select="."/></format>
   </xsl:template>
 
       <format><xsl:value-of select="."/></format>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:identifier">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:identifier
+  | oai:record/oai:metadata/oai_dc:dc/oai_dc:identifier">

       <dc:identifier><xsl:value-of select="."/></dc:identifier>
   </xsl:template>
 
       <dc:identifier><xsl:value-of select="."/></dc:identifier>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:publisher">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:publisher
+  | oai:record/oai:metadata/oai_dc:dc/oai_dc:publisher">

       <dc:publisher><xsl:value-of select="."/></dc:publisher>
   </xsl:template>
 
       <dc:publisher><xsl:value-of select="."/></dc:publisher>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:relation">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:relation
+  | oai:record/oai:metadata/oai_dc:dc/oai_dc:relation">

       <dc:relation><xsl:value-of select="."/></dc:relation>
   </xsl:template>
 
       <dc:relation><xsl:value-of select="."/></dc:relation>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/subject">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:subject
+  | oai:record/oai:metadata/oai_dc:dc/oai_dc:subject">

       <subject><xsl:value-of select="."/></subject>
   </xsl:template>
 
       <subject><xsl:value-of select="."/></subject>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:title">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:title
+  | oai:record/oai:metadata/oai_dc:dc/oai_dc:title">

       <dc:title><xsl:value-of select="."/></dc:title>
   </xsl:template>
 
       <dc:title><xsl:value-of select="."/></dc:title>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:type">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:type
+  | oai:record/oai:metadata/oai_dc:dc/oai_dc:type">

       <dc:type><xsl:value-of select="."/></dc:type>
   </xsl:template>
 
       <dc:type><xsl:value-of select="."/></dc:type>
   </xsl:template>
 

diff --git a/examples/oai-pmh/conf/oai2index.xsl b/examples/oai-pmh/conf/oai2index.xsl
index ac30268..7ffbbcb 100644 (file)
--- a/examples/oai-pmh/conf/oai2index.xsl
+++ b/examples/oai-pmh/conf/oai2index.xsl
@@ -42,79 +42,92 @@
   </xsl:template>
 
   <!-- DC specific indexing templates -->
   </xsl:template>
 
   <!-- DC specific indexing templates -->

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:title">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:title 
+                    | oai:record/oai:metadata/oai_dc:dc/oai_dc:title">

     <z:index name="any:w dc_title:w dc_title:p">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 
     <z:index name="any:w dc_title:w dc_title:p">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:creator">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:creator
+                    | oai:record/oai:metadata/oai_dc:dc/oai_dc:creator">

     <z:index name="any:w dc_creator:w dc_creator:p">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 
     <z:index name="any:w dc_creator:w dc_creator:p">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:subject">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:subject
+                    | oai:record/oai:metadata/oai_dc:dc/oai_dc:subject">

     <z:index name="any:w dc_subject:w dc_subject:p">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 
     <z:index name="any:w dc_subject:w dc_subject:p">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:description">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:description
+                    | oai:record/oai:metadata/oai_dc:dc/oai_dc:description">

     <z:index name="any:w dc_description:w">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 
     <z:index name="any:w dc_description:w">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:contributor">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:contributor
+                    | oai:record/oai:metadata/oai_dc:dc/oai_dc:contributor">

     <z:index name="any:w dc_contributor:w dc_contributor:p">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 
     <z:index name="any:w dc_contributor:w dc_contributor:p">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:publisher">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:publisher
+                    | oai:record/oai:metadata/oai_dc:dc/oai_dc:publisher">

     <z:index name="dc_publisher:p dc_publisher:w">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 
     <z:index name="dc_publisher:p dc_publisher:w">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:date">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:date
+                    | oai:record/oai:metadata/oai_dc:dc/oai_dc:date">

     <z:index name="dc_date:0">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 
     <z:index name="dc_date:0">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:format">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:format
+                    | oai:record/oai:metadata/oai_dc:dc/oai_dc:format">

     <z:index name="dc_format:0">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 
     <z:index name="dc_format:0">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:identifier">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:identifier
+                    | oai:record/oai:metadata/oai_dc:dc/oai_dc:identifier">

     <z:index name="dc_identifier:0">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 
     <z:index name="dc_identifier:0">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:source">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:source
+                    | oai:record/oai:metadata/oai_dc:dc/oai_dc:source">

     <z:index name="dc_source:0">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 
     <z:index name="dc_source:0">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:language">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:language
+                    | oai:record/oai:metadata/oai_dc:dc/oai_dc:language">

     <z:index name="dc_language:w">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 
     <z:index name="dc_language:w">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:relation">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:relation
+                    | oai:record/oai:metadata/oai_dc:dc/oai_dc:relation">

     <z:index name="dc_relation:0">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 
     <z:index name="dc_relation:0">
       <xsl:value-of select="."/>
     </z:index>
   </xsl:template>
 

-  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:rights">
+  <xsl:template match="oai:record/oai:metadata/oai_dc:dc/dc:rights
+                    | oai:record/oai:metadata/oai_dc:dc/oai_dc:rights">

     <z:index name="dc_rights:p dc_rights:w">
       <xsl:value-of select="."/>
     </z:index>
     <z:index name="dc_rights:p dc_rights:w">
       <xsl:value-of select="."/>
     </z:index>

diff --git a/examples/oai-pmh/conf/oai2zebra.xsl b/examples/oai-pmh/conf/oai2zebra.xsl
index 07d3799..ff59dac 100644 (file)
--- a/examples/oai-pmh/conf/oai2zebra.xsl
+++ b/examples/oai-pmh/conf/oai2zebra.xsl
@@ -25,9 +25,11 @@
        z:schema="{$schema}"
        z:size="{$size}"
        >
        z:schema="{$schema}"
        z:size="{$size}"
        >

+     <!--

      <title>
        <xsl:value-of select="oai:record/oai:metadata/oai_dc:dc/dc:title"/>
      </title>
      <title>
        <xsl:value-of select="oai:record/oai:metadata/oai_dc:dc/dc:title"/>
      </title>

+     -->

    </z:record>
 
  </xsl:template>
    </z:record>
 
  </xsl:template>