From: Jakub Skoczen <jakub@indexdata.dk>
Date: Mon, 14 Apr 2014 20:07:36 +0000 (+0200)
Subject: Handle medium override AND md field
X-Git-Tag: v1.6.41~4
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=1c24eb43dad04a5ca3676119d12e4bbac485a245;p=pazpar2-moved-to-github.git

Handle medium override AND md field
---

diff --git a/etc/cf.xsl b/etc/cf.xsl
index 1c05886..7796273 100644
--- a/etc/cf.xsl
+++ b/etc/cf.xsl
@@ -26,7 +26,16 @@
   <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>
@@ -104,9 +113,9 @@
       <xsl:value-of select="."/>
     </pz:metadata>
   </xsl:template>
-
-  <xsl:template match="medium">
-  </xsl:template>
+  
+  <!-- no-op template to avoid printing medium out --> 
+  <xsl:template match="medium" />
 
   <xsl:template match="*" >
     <pz:metadata type="{local-name()}">