X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=etc%2Fcf.xsl;h=61edc04e5769a588664a672c2356d90335fc732e;hb=edd733fc15f1555c460c1d68d5c8010b30eb80d6;hp=fc18204cec469df00a02d0ede20b5ada01cb58cd;hpb=d262b1c3167ea63dc235600d8da08236c607c7bb;p=pazpar2-moved-to-github.git

diff --git a/etc/cf.xsl b/etc/cf.xsl
index fc18204..61edc04 100644
--- a/etc/cf.xsl
+++ b/etc/cf.xsl
@@ -16,10 +16,20 @@
 
   <xsl:param name="medium" />
 
+  <!-- Use medium parameter if given. Default to medium from connector -->
   <xsl:template match="/record">
     <pz:record>
       <pz:metadata type="medium">
-         <xsl:value-of select="$medium" />
+        <xsl:choose>
+          <xsl:when test="string-length($medium)">
+            <xsl:value-of select="$medium" />
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:if test="medium">
+             <xsl:value-of select="medium" />
+            </xsl:if>
+          </xsl:otherwise>
+        </xsl:choose>
       </pz:metadata>
       <xsl:apply-templates/>
     </pz:record>
@@ -55,98 +65,34 @@
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="author">
-    <pz:metadata type="author">
-      <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:value-of select="."/>
-    </pz:metadata>
-  </xsl:template>
-
-  <xsl:template match="subject">
-    <pz:metadata type="subject">
-      <xsl:value-of select="."/>
-    </pz:metadata>
-  </xsl:template>
-
-  <xsl:template match="isbn">
-    <pz:metadata type="isbn">
-      <xsl:value-of select="."/>
-    </pz:metadata>
-  </xsl:template>
-
-  <xsl:template match="issn">
-    <pz:metadata type="issn">
-      <xsl:value-of select="."/>
-    </pz:metadata>
-  </xsl:template>
-
   <xsl:template match="journaltitle">
     <pz:metadata type="journal-title">
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
 
-  <xsl:template match="volume">
-    <pz:metadata type="volume">
-      <xsl:value-of select="."/>
-    </pz:metadata>
-  </xsl:template>
-
-  <xsl:template match="issue">
-    <pz:metadata type="issue">
-      <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="string-length(location)">
-	  <xsl:value-of select="location"/>
-	</xsl:when>
-	<xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
-      </xsl:choose>
+    <pz:metadata type="due" empty="PAZPAR2_NULL_VALUE">
+      <xsl:value-of select="due"/>
     </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 type="locallocation" empty="PAZPAR2_NULL_VALUE">
+      <xsl:value-of select="location"/>
     </pz:metadata>
-    <pz:metadata type="available">
-      <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 type="callnumber" empty="PAZPAR2_NULL_VALUE">
+      <xsl:value-of select="callno"/>
     </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 type="available" empty="PAZPAR_NULL_VALUE">
+      <xsl:value-of select="available"/>
     </pz:metadata>
-  </xsl:template>
-
-  <xsl:template match="due">
-    <pz:metadata type="due">
-      <xsl:value-of select="."/>
+    <pz:metadata type="publicnote" empty="PAZPAR2_NULL_VALUE">
+      <xsl:value-of select="publicnote"/>
     </pz:metadata>
   </xsl:template>
 
@@ -161,15 +107,12 @@
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
+  
+  <!-- no-op template to avoid printing medium out --> 
+  <xsl:template match="medium" />
 
-  <xsl:template match="thumburl">
-    <pz:metadata type="thumburl">
-      <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>