slimpac issue where deleted copies are visisble, spotted by Steve Callendar and Jason...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@19252 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm b/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
index 5419a91..f88fd6f 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
@@ -2880,6 +2880,7 @@ sub as_xml {
     $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";
 

diff --git a/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl b/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl
index 0b2c14a..2b657af 100644 (file)
--- a/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl
+++ b/Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl
@@ -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>