X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=etc%2Fcf.xsl;h=77962739b86684f7c54f85ac7702bc56f4fd1ab6;hb=ed8400c109b2a440ed32e78368a554a35411e5b3;hp=53e8fc1e772ef0223c1f11721d9b5be73052886d;hpb=2a814c44df1e73ab506d61ce7c343dd0fc4f56aa;p=pazpar2-moved-to-github.git

diff --git a/etc/cf.xsl b/etc/cf.xsl
index 53e8fc1..7796273 100644
--- a/etc/cf.xsl
+++ b/etc/cf.xsl
@@ -14,26 +14,50 @@
         version="1.0"
         encoding="UTF-8"/>
 
+  <xsl:param name="medium" />
+
+  <!--
+    According to cf/builder/templates/parseTask.cff, connectors can
+    also generate a "medium" field, but that is ignored in this
+    stylesheet, the rule below instead using an XSLT parameter.
+    Should the data element be used in preference when it is included?
+  -->
+
   <xsl:template match="/record">
     <pz:record>
-      <xsl:attribute name="mergekey">
-	      <xsl:text>title </xsl:text>
-        <xsl:value-of select="title" />
-	      <xsl:text> author </xsl:text>
-        <xsl:value-of select="author"/>
-      </xsl:attribute>
+      <pz:metadata type="medium">
+        <xsl:choose>
+          <xsl:when test="string-length($medium)">
+            <xsl:value-of select="$medium" />
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:if test="medium">
+             <xsl:value-of select="medium" />
+            </xsl:if>
+          </xsl:otherwise>
+        </xsl:choose>
+      </pz:metadata>
       <xsl:apply-templates/>
     </pz:record>
   </xsl:template>
 
-  <xsl:template match="url">
-    <pz:metadata type="electronic-url">
+  <!--
+      The elements mapped in the following clauses should be kept more
+      or less in sync with those named in builder/templates/search.cft
+      in the "cf" git module.
+  -->
+
+  <xsl:template match="date">
+    <pz:metadata type="publication-date">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+    <pz:metadata type="date">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="author">
-    <pz:metadata type="author">
+  <xsl:template match="url">
+    <pz:metadata type="electronic-url">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
@@ -42,16 +66,59 @@
     <pz:metadata type="title">
       <xsl:value-of select="."/>
     </pz:metadata>
+    <pz:metadata type="title-complete">
+      <xsl:value-of select="." />
+    </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="date">
-    <pz:metadata type="publication-date">
+  <xsl:template match="journaltitle">
+    <pz:metadata type="journal-title">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <!--
+    According to cf/builder/templates/parseTask.cff, connectors can
+    also generate a "holding" field, but it's not clear how that is
+    different from "item".  Perhaps this "item" rule should also
+    handle "holding" in the same way?
+  -->
+
+  <xsl:template match="item">
+    <pz:metadata type="due" empty="PAZPAR2_NULL_VALUE">
+      <xsl:value-of select="due"/>
+    </pz:metadata>
+    <pz:metadata type="locallocation" empty="PAZPAR2_NULL_VALUE">
+      <xsl:value-of select="location"/>
+    </pz:metadata>
+    <pz:metadata type="callnumber" empty="PAZPAR2_NULL_VALUE">
+      <xsl:value-of select="callno"/>
+    </pz:metadata>
+    <pz:metadata type="available" empty="PAZPAR_NULL_VALUE">
+      <xsl:value-of select="available"/>
+    </pz:metadata>
+    <pz:metadata type="publicnote" empty="PAZPAR2_NULL_VALUE">
+      <xsl:value-of select="publicnote"/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="location">
+    <pz:metadata type="locallocation">
+      <xsl:value-of select="."/>
+    </pz:metadata>
+  </xsl:template>
+
+  <xsl:template match="callno">
+    <pz:metadata type="callnumber">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
+  
+  <!-- no-op template to avoid printing medium out --> 
+  <xsl:template match="medium" />
 
-  <xsl:template match="description">
-    <pz:metadata type="description">
+  <xsl:template match="*" >
+    <pz:metadata type="{local-name()}">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>