X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fcf.xsl;h=324cdda90756c8d05e1421ea2036b0978e209279;hb=0bb0ee0e00d750808e228b991c78cb4838bc989d;hp=873cfa1611b4ecc50b3a4fdb3bf3be2f3769e427;hpb=15934c78c0fbb37a04f1a7a225a1cdee9854b257;p=pazpar2-moved-to-github.git

diff --git a/etc/cf.xsl b/etc/cf.xsl
index 873cfa1..324cdda 100644
--- a/etc/cf.xsl
+++ b/etc/cf.xsl
@@ -14,8 +14,20 @@
         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>
+      <pz:metadata type="medium">
+         <xsl:value-of select="$medium" />
+      </pz:metadata>
       <xsl:apply-templates/>
     </pz:record>
   </xsl:template>
@@ -30,6 +42,9 @@
     <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="url">
@@ -42,36 +57,28 @@
     <pz:metadata type="title">
       <xsl:value-of select="."/>
     </pz:metadata>
-  </xsl:template>
-
-  <xsl:template match="author">
-    <pz:metadata type="author">
-      <xsl:value-of select="."/>
+    <pz:metadata type="title-complete">
+      <xsl:value-of select="." />
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="description">
-    <pz:metadata type="description">
-      <xsl:value-of select="."/>
-    </pz:metadata>
-  </xsl:template>
-  
-  <xsl:template match="publisher">
-    <pz:metadata type="publisher">
+  <xsl:template match="journaltitle">
+    <pz:metadata type="journal-title">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="subject">
-    <pz:metadata type="subject">
-      <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="locallocation">
       <xsl:choose>
-	<xsl:when test="location">
+	<xsl:when test="string-length(location)">
 	  <xsl:value-of select="location"/>
 	</xsl:when>
 	<xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
@@ -79,36 +86,44 @@
     </pz:metadata>
     <pz:metadata type="callnumber">
       <xsl:choose>
-	<xsl:when test="callno">
+	<xsl:when test="string-length(callno)">
 	  <xsl:value-of select="callno"/>
 	</xsl:when>
 	<xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
       </xsl:choose>
     </pz:metadata>
-    <pz:metadata type="publicnote">
+    <pz:metadata type="available">
       <xsl:choose>
-	<xsl:when test="available">
+	<xsl:when test="string-length(available)">
 	  <xsl:value-of select="available"/>
 	</xsl:when>
 	<xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
       </xsl:choose>
     </pz:metadata>
+    <pz:metadata type="publicnote">
+      <xsl:choose>
+	<xsl:when test="string-length(publicnote)">
+	  <xsl:value-of select="publicnote"/>
+	</xsl:when>
+	<xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
+      </xsl:choose>
+    </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="due">
-    <pz:metadata type="due">
+  <xsl:template match="location">
+    <pz:metadata type="locallocation">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="thumburl">
-    <pz:metadata type="thumburl">
+  <xsl:template match="callno">
+    <pz:metadata type="callnumber">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="score">
-    <pz:metadata type="score">
+  <xsl:template match="*" >
+    <pz:metadata type="{local-name()}">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>