X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=etc%2Fcf.xsl;h=959c82c2c90753e3acc6f0d50971320f8d77eab0;hb=cb56334872442eff1fa49690c1c9c05974fff6b0;hp=b081eb9f3d4cff922c8f4ea5b8bb16b83dbdca9f;hpb=df7b6398e067e5b68a183d8fa42be5f5aa7b4deb;p=pazpar2-moved-to-github.git

diff --git a/etc/cf.xsl b/etc/cf.xsl
index b081eb9..959c82c 100644
--- a/etc/cf.xsl
+++ b/etc/cf.xsl
@@ -68,9 +68,38 @@
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="available">
+  <xsl:template match="item">
+    <pz:metadata type="locallocation">
+      <xsl:choose>
+	<xsl:when test="string-length(location)">
+	  <xsl:value-of select="location"/>
+	</xsl:when>
+	<xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
+      </xsl:choose>
+    </pz:metadata>
+    <pz:metadata type="callnumber">
+      <xsl:choose>
+	<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="available">
-      <xsl:value-of select="."/>
+      <xsl:choose>
+	<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>
 
@@ -80,18 +109,6 @@
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="location">
-    <pz:metadata type="location">
-      <xsl:value-of select="."/>
-    </pz:metadata>
-  </xsl:template>
-
-  <xsl:template match="callno">
-    <pz:metadata type="callno">
-      <xsl:value-of select="."/>
-    </pz:metadata>
-  </xsl:template>
-
   <xsl:template match="thumburl">
     <pz:metadata type="thumburl">
       <xsl:value-of select="."/>