X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=etc%2Fcf.xsl;h=ac8d0dd73faf2683ca647c1110cea9e81f9a622d;hb=b0cc664ec016d7e2cfba5bffada691f49f813a2a;hp=873cfa1611b4ecc50b3a4fdb3bf3be2f3769e427;hpb=15934c78c0fbb37a04f1a7a225a1cdee9854b257;p=pazpar2-moved-to-github.git

diff --git a/etc/cf.xsl b/etc/cf.xsl
index 873cfa1..ac8d0dd 100644
--- 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">
@@ -71,7 +74,7 @@
   <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,20 +82,28 @@
     </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">
@@ -101,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="."/>