From 84ebbe6a89e15c3ec349dadf4680563cb2018879 Mon Sep 17 00:00:00 2001 From: Ian Walls Date: Wed, 30 Mar 2011 13:39:53 -0400 Subject: [PATCH] Bug 5990: Lists and Cart show LOC code not Location Authorized value Lists in the OPAC, and Cart on both sides, show the LOC code for items, rather than the appropriate Description from Authorised Values. This is because the code uses GetItemInfo, which is a very heavy-weight call to only retrieve some of the desired information. This patch introduces a new subroutine in C4::Items, GetItemsLocationInfo, which returns the branch names for both home- and holdingbranches, the location code, both opac and intranet location descriptions, itemcallnumber and cn_sort. This should be used instead of GetItemsInfo in any case where the locational information is all that's required, as it's much more streamlined and efficient. In the OPAC Lists, this only applies if OPACXSLTResultsDisplay is 'off' (set to 'normal'). Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack (cherry picked from commit 90392c19cc343ada611c1f06e4b5c20f3dd6dc93) Signed-off-by: Chris Nighswonger --- C4/Items.pm | 67 +++++++++++++++++++ C4/VirtualShelves/Page.pm | 2 +- .../prog/en/modules/opac-basket.tmpl | 4 +- .../prog/en/modules/opac-shelves.tmpl | 2 +- opac/opac-basket.pl | 2 +- 5 files changed, 72 insertions(+), 5 deletions(-) diff --git a/C4/Items.pm b/C4/Items.pm index 05df0c56f0..bbd0ece326 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -65,6 +65,7 @@ BEGIN { GetItemInfosOf GetItemsByBiblioitemnumber GetItemsInfo + GetItemsLocationInfo get_itemnumbers_of GetItemnumberFromBarcode GetBarcodeFromItemnumber @@ -1347,6 +1348,72 @@ sub GetItemsInfo { } } +=head2 GetItemsLocationInfo + + my @itemlocinfo = GetItemsLocationInfo($biblionumber); + +Returns the branch names, shelving location and itemcallnumber for each item attached to the biblio in question + +C returns a list of references-to-hash. Data returned: + +=over 2 + +=item C<$data-E{homebranch}> + +Branch Name of the item's homebranch + +=item C<$data-E{holdingbranch}> + +Branch Name of the item's holdingbranch + +=item C<$data-E{location}> + +Item's shelving location code + +=item C<$data-E{location_intranet}> + +The intranet description for the Shelving Location as set in authorised_values 'LOC' + +=item C<$data-E{location_opac}> + +The OPAC description for the Shelving Location as set in authorised_values 'LOC'. Falls back to intranet description if no OPAC +description is set. + +=item C<$data-E{itemcallnumber}> + +Item's itemcallnumber + +=item C<$data-E{cn_sort}> + +Item's call number normalized for sorting + +=back + +=cut + +sub GetItemsLocationInfo { + my $biblionumber = shift; + my @results; + + my $dbh = C4::Context->dbh; + my $query = "SELECT a.branchname as homebranch, b.branchname as holdingbranch, + location, itemcallnumber, cn_sort + FROM items, branches as a, branches as b + WHERE homebranch = a.branchcode AND holdingbranch = b.branchcode + AND biblionumber = ? + ORDER BY cn_sort ASC"; + my $sth = $dbh->prepare($query); + $sth->execute($biblionumber); + + while ( my $data = $sth->fetchrow_hashref ) { + $data->{location_intranet} = GetKohaAuthorisedValueLib('LOC', $data->{location}); + $data->{location_opac}= GetKohaAuthorisedValueLib('LOC', $data->{location}, 1); + push @results, $data; + } + return @results; +} + + =head2 GetLastAcquisitions my $lastacq = GetLastAcquisitions({'branches' => ('branch1','branch2'), diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm index d6d0f7f7b9..49d1aa8ece 100644 --- a/C4/VirtualShelves/Page.pm +++ b/C4/VirtualShelves/Page.pm @@ -216,7 +216,7 @@ sub shelfpage ($$$$$) { $this_item->{'normalized_oclc'} = GetNormalizedOCLCNumber($record,$marcflavour); $this_item->{'normalized_isbn'} = GetNormalizedISBN(undef,$record,$marcflavour); # Getting items infos for location display - my @items_infos = &GetItemsInfo( $this_item->{'biblionumber'}, $type ); + my @items_infos = &GetItemsLocationInfo( $this_item->{'biblionumber'}); $this_item->{'itemsissued'} = CountItemsIssued( $this_item->{'biblionumber'} ); $this_item->{'ITEM_RESULTS'} = \@items_infos; diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl index b64205bf57..4928daa252 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl @@ -293,7 +293,7 @@ function tagAdded() { Location(s)
  • - , + , () @@ -367,7 +367,7 @@ function tagAdded() {
    • - , + , () diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl index 3c04429baf..7441887a29 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl @@ -267,7 +267,7 @@ $(function() { Holdings: - , + , ()., diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl index c453c87d22..bfee06c520 100755 --- a/opac/opac-basket.pl +++ b/opac/opac-basket.pl @@ -68,7 +68,7 @@ foreach my $biblionumber ( @bibs ) { my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); my $marcseriesarray = GetMarcSeries ($record,$marcflavour); my $marcurlsarray = GetMarcUrls ($record,$marcflavour); - my @items = &GetItemsInfo( $biblionumber, 'opac' ); + my @items = &GetItemsLocationInfo( $biblionumber ); my $subtitle = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber)); my $hasauthors = 0; -- 2.39.5