X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=etc%2Fopac.xsl;h=dd5c789077257a864f163f1aefd8b9633565e836;hb=8c24d1e84b45566c30a05008bedf71cce42d3d05;hp=aa1eabe53983066c1bc9a8626b55b976b15e1081;hpb=fdae7833b5d6c1868093e620bbe0783d06484e7d;p=pazpar2-moved-to-github.git

diff --git a/etc/opac.xsl b/etc/opac.xsl
index aa1eabe..dd5c789 100644
--- a/etc/opac.xsl
+++ b/etc/opac.xsl
@@ -15,51 +15,37 @@
 
   <xsl:template name="record-hook">
     <xsl:for-each select="/opacRecord/holdings/holding">
-      <pz:metadata type="locallocation">
-        <xsl:choose>
-          <xsl:when test="localLocation">
-            <xsl:value-of select="localLocation"/>
-          </xsl:when>
-          <xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
-        </xsl:choose>
+      <pz:metadata type="locallocation" empty="PAZPAR2_NULL_VALUE">
+	<xsl:value-of select="localLocation"/>
       </pz:metadata>
-      <pz:metadata type="callnumber">
-        <xsl:choose>
-          <xsl:when test="callNumber">
-            <xsl:value-of select="callNumber"/>
-          </xsl:when>
-          <xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
-        </xsl:choose>
+      <pz:metadata type="callnumber" empty="PAZPAR2_NULL_VALUE">
+	<xsl:value-of select="callNumber"/>
       </pz:metadata>
-      <pz:metadata type="publicnote">
-        <xsl:choose>
-          <xsl:when test="publicNote">
-            <xsl:value-of select="publicNote"/>
-          </xsl:when>
-          <xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
-        </xsl:choose>
+      <pz:metadata type="publicnote" empty="PAZPAR2_NULL_VALUE">
+	<xsl:value-of select="publicNote"/>
       </pz:metadata>
-      <pz:metadata type="available">
+      <pz:metadata type="available" empty="PAZPAR2_NULL_VALUE">
         <xsl:choose>
           <xsl:when test="circulations/circulation/availableNow/@value = '1'">
              Available
           </xsl:when>
           <xsl:when test="circulations/circulation/availableNow/@value = '0'">
-             <xsl:choose>
-               <xsl:when test="circulations/circulation/availabiltyDate">
-                 <xsl:value-of select="circulations/circulation/availabiltyDate"/>
-               </xsl:when>
-               <xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
-             </xsl:choose>
-          </xsl:when>
-          <xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
+	    <xsl:value-of select="circulations/circulation/availabiltyDate"/>
+	  </xsl:when>
         </xsl:choose>
       </pz:metadata>
     </xsl:for-each>
   </xsl:template>
 
   <xsl:template match="/">
-    <xsl:apply-templates select="opacRecord/bibliographicRecord"/>
+    <xsl:choose>
+      <xsl:when test="opacRecord">
+        <xsl:apply-templates select="opacRecord/bibliographicRecord"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates/>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
 </xsl:stylesheet>