[open-ils-commits] r19252 - in trunk/Open-ILS: src/perlmods/OpenILS/Application xsl (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2011-01-21 15:40:28 -0500 (Fri, 21 Jan 2011)
New Revision: 19252

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
   trunk/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl
Log:
slimpac issue where deleted copies are visisble, spotted by Steve Callendar and Jason Etheridge

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm	2011-01-21 20:39:16 UTC (rev 19251)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm	2011-01-21 20:40:28 UTC (rev 19252)
@@ -2880,6 +2880,7 @@
     $xml .= 'id="tag:open-ils.org:asset-call_number/' . $self->obj->id . '" ';
     $xml .= 'lib="' . $self->escape( $self->obj->owning_lib->shortname ) . '" ';
     $xml .= 'opac_visible="' . $self->obj->owning_lib->opac_visible . '" ';
+    $xml .= 'deleted="' . $self->obj->deleted . '" ';
     $xml .= 'label="' . $self->escape( $self->obj->label ) . '">';
     $xml .= "\n";
 

Modified: trunk/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl
===================================================================
--- trunk/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl	2011-01-21 20:39:16 UTC (rev 19251)
+++ trunk/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl	2011-01-21 20:40:28 UTC (rev 19252)
@@ -77,17 +77,17 @@
           <xsl:apply-templates select="hold:volume/hold:uris/hold:uri"/>
         </ul>
     </xsl:if>
-    <xsl:if test="count(hold:volume/hold:copies/hold:copy) &gt; 0">
+    <xsl:if test="count(hold:volume[deleted='f']/hold:copies/hold:copy[deleted='f']) &gt; 0">
     	<u>Holdings</u>
         <ul>
-          <xsl:apply-templates select="hold:volume">
+          <xsl:apply-templates select="hold:volume[deleted='f']">
             <xsl:sort select="@lib"/>
           </xsl:apply-templates>
         </ul>
     </xsl:if>
   </xsl:template>
 
-  <xsl:template match="hold:volume">
+  <xsl:template match="hold:volume[deleted='f']">
       <li>
        <b>
         <a>
@@ -121,13 +121,13 @@
 
   <xsl:template match="hold:copies">
     <ul>
-    <xsl:apply-templates select="hold:copy">
+    <xsl:apply-templates select="hold:copy[deleted='f']">
       <xsl:sort select="hold:location"/>
     </xsl:apply-templates>
     </ul>
   </xsl:template>
 
-  <xsl:template match="hold:copy">
+  <xsl:template match="hold:copy[deleted='f']">
       <li> <xsl:value-of select="@barcode"/> <abbr class="unapi-id"><xsl:attribute name="title"><xsl:value-of select="@id"/></xsl:attribute></abbr>
         <ul>
     	  <li>Circulating from <b><xsl:value-of select="hold:circlib"/></b></li>