Bug 2655: Fixes availabilty counts if items are on hold shelf. Patch (2/2)

This fixes the opac results - non xsl transformed - and the intranet result lists.

Also fixes opac-detail which was showing all items 'on hold' if there was a bib level request, whether items were on the hold shelf or not.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
This commit is contained in:
Garry Collum 2010-02-20 20:21:01 -05:00 committed by Galen Charlton
parent 9fa69bff82
commit a37545eb14
4 changed files with 14 additions and 1 deletions

View File

@ -27,6 +27,7 @@ use XML::Simple;
use C4::Dates qw(format_date);
use C4::XSLT;
use C4::Branch;
use C4::Reserves; # CheckReserves
use C4::Debug;
use YAML;
use URI::Escape;
@ -1516,6 +1517,7 @@ sub searchResults {
my $itemdamaged_count = 0;
my $item_in_transit_count = 0;
my $can_place_holds = 0;
my $item_onhold_count = 0;
my $items_count = scalar(@fields);
my $maxitems =
( C4::Context->preference('maxItemsinSearchResults') )
@ -1573,6 +1575,10 @@ sub searchResults {
my $transfertwhen = '';
my ($transfertfrom, $transfertto);
# is item on the reserve shelf?
my $reservestatus = 0;
my $reserveitem;
unless ($item->{wthdrawn}
|| $item->{itemlost}
|| $item->{damaged}
@ -1592,6 +1598,7 @@ sub searchResults {
# should map transit status to record indexed in Zebra.
#
($transfertwhen, $transfertfrom, $transfertto) = C4::Circulation::GetTransfers($item->{itemnumber});
($reservestatus, $reserveitem) = C4::Reserves::CheckReserves($item->{itemnumber});
}
# item is withdrawn, lost or damaged
@ -1599,12 +1606,14 @@ sub searchResults {
|| $item->{itemlost}
|| $item->{damaged}
|| $item->{notforloan}
|| $reservestatus eq 'Waiting'
|| ($transfertwhen ne ''))
{
$wthdrawn_count++ if $item->{wthdrawn};
$itemlost_count++ if $item->{itemlost};
$itemdamaged_count++ if $item->{damaged};
$item_in_transit_count++ if $transfertwhen ne '';
$item_onhold_count++ if $reservestatus eq 'Waiting';
$item->{status} = $item->{wthdrawn} . "-" . $item->{itemlost} . "-" . $item->{damaged} . "-" . $item->{notforloan};
$other_count++;
@ -1613,6 +1622,7 @@ sub searchResults {
$other_items->{$key}->{$_} = $item->{$_};
}
$other_items->{$key}->{intransit} = ($transfertwhen ne '') ? 1 : 0;
$other_items->{$key}->{onhold} = ($reservestatus) ? 1 : 0;
$other_items->{$key}->{notforloan} = GetAuthorisedValueDesc('','',$item->{notforloan},'','',$notforloan_authorised_value) if $notforloan_authorised_value;
$other_items->{$key}->{count}++ if $item->{$hbranch};
$other_items->{$key}->{location} = $shelflocations->{ $item->{location} };
@ -1677,6 +1687,7 @@ sub searchResults {
$oldbiblio->{itemlostcount} = $itemlost_count;
$oldbiblio->{damagedcount} = $itemdamaged_count;
$oldbiblio->{intransitcount} = $item_in_transit_count;
$oldbiblio->{onholdcount} = $item_onhold_count;
$oldbiblio->{orderedcount} = $ordered_count;
$oldbiblio->{isbn} =~
s/-//g; # deleting - in isbn to enable amazon content

View File

@ -515,6 +515,7 @@ function GetZ3950Terms(){
<!-- TMPL_IF NAME="itemlost" -->(Lost)<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="damaged" -->(Damaged)<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="intransit" -->(In transit)<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="onhold" -->(On hold)<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="notforloan" --><!-- TMPL_VAR name="notforloan" --><!-- /TMPL_IF -->
(<!-- TMPL_VAR NAME="count" -->)</li>
<!-- /TMPL_LOOP --></ul>

View File

@ -406,7 +406,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
In transit from <!-- TMPL_VAR NAME="transfertfrom" -->
to <!-- TMPL_VAR NAME="transfertto" --> since <!-- TMPL_VAR NAME="transfertwhen" -->
<!-- TMPL_ELSE -->
<!-- TMPL_IF NAME="waiting" -->On hold<!-- TMPL_ELSE --><!-- TMPL_IF NAME="onhold" -->On hold<!-- TMPL_ELSE -->Available<!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="waiting" -->On hold<!-- TMPL_ELSE -->Available<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

View File

@ -447,6 +447,7 @@ $(document).ready(function(){
<!-- TMPL_UNLESS NAME="hidelostitems" --><!-- TMPL_IF NAME="itemlostcount" --> Lost (<!-- TMPL_VAR NAME="itemlostcount" -->),<!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
<!-- TMPL_IF NAME="damagedcount" --> Damaged (<!-- TMPL_VAR NAME="damagedcount" -->),<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="orderedcount" --> On order (<!-- TMPL_VAR NAME="orderedcount" -->),<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="onholdcount" --> On hold (<!-- TMPL_VAR NAME="onholdcount" -->),<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="intransitcount" --> In transit (<!-- TMPL_VAR NAME="intransitcount" -->),<!-- /TMPL_IF -->
</span>
</span>