Merge in changes that were made for CMC.

* The "date" input field is now mapped to both "date" and
  "publication_date".  Previously it was only "publication_date",
  which is different from what all pazpar2's other .xsl files produce,
  with the result that a UI that uses "md-date" would not see dates
  from CF targets.  Adding "date" output as well fixed bug #3218 for
  CMC, and will also fix the (presumably as-yet unnoticed)
  date-display bugs in other Masterkey applications that use CF
  targets.  It did not remove the "publication_date" output in case we
  have other Masterkey UIs that expect to see this date.

* Add support for the CF's "location" and "callno" fields.

diff --git a/etc/cf.xsl b/etc/cf.xsl
index 959c82c..ac8d0dd 100644 (file)
--- a/etc/cf.xsl
+++ b/etc/cf.xsl
@@ -30,6 +30,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">
@@ -109,6 +112,18 @@
     </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>
+
   <xsl:template match="thumburl">
     <pz:metadata type="thumburl">
       <xsl:value-of select="."/>