Update OPAC stylesheets for availabilityDate PAZ-943

[pazpar2-moved-to-github.git] / etc / opac_turbomarc.xsl

diff --git a/etc/opac_turbomarc.xsl b/etc/opac_turbomarc.xsl
index 4c3fe80..430a43e 100644 (file)
--- a/etc/opac_turbomarc.xsl
+++ b/etc/opac_turbomarc.xsl
@@ -15,51 +15,36 @@
 
   <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/availabilityDate"/>
+         </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>