X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fopac.xsl;h=78f3b22d5ddd92c20c8f2b6a4f055a1833fd0862;hb=5d292b54354dd975b1a9511c3222bdffdf18de38;hp=6fe5ecd96bebf44ccbc79398cd821a9ca575d671;hpb=2d03cac1322090a55c18b700b126db86b99fa0e9;p=pazpar2-moved-to-github.git

diff --git a/etc/opac.xsl b/etc/opac.xsl
index 6fe5ecd..78f3b22 100644
--- a/etc/opac.xsl
+++ b/etc/opac.xsl
@@ -15,43 +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="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="publicnote" empty="PAZPAR2_NULL_VALUE">
+	<xsl:value-of select="publicNote"/>
       </pz:metadata>
-      <pz:metadata type="publicnote">
+      <pz:metadata type="available" empty="PAZPAR2_NULL_VALUE">
         <xsl:choose>
-	  <xsl:when test="publicNote">
-	    <xsl:value-of select="publicNote"/>
+          <xsl:when test="circulations/circulation/availableNow/@value = '1'">
+             Available
+          </xsl:when>
+          <xsl:when test="circulations/circulation/availableNow/@value = '0'">
+	    <xsl:value-of select="circulations/circulation/availabilityDate"/>
 	  </xsl:when>
-	  <xsl:otherwise>PAZPAR2_NULL_VALUE</xsl:otherwise>
-	</xsl:choose>
+        </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>