X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=etc%2Fcf.xsl;h=ac8d0dd73faf2683ca647c1110cea9e81f9a622d;hb=88f96194d5a63278eb57b32c814019dab51da9ff;hp=0f878e01c225a64c47de9fc12c2428e353f21e64;hpb=d01d8da7edf2b9b397b5326188ff0274e8b6fa6e;p=pazpar2-moved-to-github.git

diff --git a/etc/cf.xsl b/etc/cf.xsl
index 0f878e0..ac8d0dd 100644
--- a/etc/cf.xsl
+++ b/etc/cf.xsl
@@ -26,14 +26,17 @@
       in the "cf" git module.
   -->
 
-  <xsl:template match="url">
-    <pz:metadata type="electronic-url">
+  <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>
@@ -44,8 +47,8 @@
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="date">
-    <pz:metadata type="publication-date">
+  <xsl:template match="author">
+    <pz:metadata type="author">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
@@ -56,27 +59,50 @@
     </pz:metadata>
   </xsl:template>
   
-  <xsl:template match="subject">
-    <pz:metadata type="subject">
+  <xsl:template match="publisher">
+    <pz:metadata type="publisher">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="thumburl">
-    <pz:metadata type="thumburl">
+  <xsl:template match="subject">
+    <pz:metadata type="subject">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="publisher">
-    <pz:metadata type="publisher">
-      <xsl:value-of select="."/>
+  <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>
-  </xsl:template>
-
-  <xsl:template match="available">
     <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>
 
@@ -87,13 +113,19 @@
   </xsl:template>
 
   <xsl:template match="location">
-    <pz:metadata type="location">
+    <pz:metadata type="locallocation">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
 
   <xsl:template match="callno">
-    <pz:metadata type="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="."/>
     </pz:metadata>
   </xsl:template>