From e543c1fe32e1cb1e1f32a0ae53baeb965b1d2993 Mon Sep 17 00:00:00 2001 From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4> Date: Fri, 21 Jan 2011 20:40:28 +0000 Subject: [PATCH] slimpac issue where deleted copies are visisble, spotted by Steve Callendar and Jason Etheridge git-svn-id: svn://svn.open-ils.org/ILS/trunk@19252 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm | 1 + Open-ILS/xsl/MARC21slim2HTMLCard-holdings.xsl | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm b/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm index 5419a91b4e..f88fd6ffaa 100644 --- 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 0b2c14ac81..2b657afbca 100644 --- 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) > 0"> + <xsl:if test="count(hold:volume[deleted='f']/hold:copies/hold:copy[deleted='f']) > 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> -- 2.11.0