From 9a5561d0e9e5485397069739031ea78dad2f2c6b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 16 Nov 2016 16:37:16 +0100 Subject: [PATCH] Bug 17642: use find_by_koha_field when needed --- C4/Items.pm | 10 ++++------ acqui/orderreceive.pl | 20 ++++++++++---------- catalogue/getitem-ajax.pl | 20 ++++++++++---------- circ/circulation.pl | 4 ++-- circ/returns.pl | 4 ++-- 5 files changed, 28 insertions(+), 30 deletions(-) diff --git a/C4/Items.pm b/C4/Items.pm index 0fc7f10..8ed08d5 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -1376,20 +1376,18 @@ sub GetItemsInfo { my $av; # get notforloan complete status if applicable - $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => $data->{frameworkcode}, kohafield => 'items.notforloan', authorised_value => $data->{itemnotforloan} }); - $av = $av->count ? $av->next : undef; + $av = Koha::AuthorisedValues->find_by_koha_field({frameworkcode => $data->{frameworkcode}, kohafield => 'items.notforloan', authorised_value => $data->{itemnotforloan} }); $data->{notforloanvalue} = $av ? $av->lib : ''; $data->{notforloanvalueopac} = $av ? $av->opac_description : ''; # get restricted status and description if applicable - $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => $data->{frameworkcode}, kohafield => 'items.restricted', authorised_value => $data->{restricted} }); - $av = $av->count ? $av->next : undef; + $av = Koha::AuthorisedValues->find_by_koha_field({frameworkcode => $data->{frameworkcode}, kohafield => 'items.restricted', authorised_value => $data->{restricted} }); $data->{restricted} = $av ? $av->lib : ''; $data->{restrictedopac} = $av ? $av->opac_description : ''; # my stack procedures - $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => $data->{frameworkcode}, kohafield => 'items.stack', authorised_value => $data->{stack} }); - $data->{stack} = $av->count ? $av->next->lib : ''; + $av = Koha::AuthorisedValues->find_by_koha_field({frameworkcode => $data->{frameworkcode}, kohafield => 'items.stack', authorised_value => $data->{stack} }); + $data->{stack} = $av ? $av->lib : ''; # Find the last 3 people who borrowed this item. my $sth2 = $dbh->prepare("SELECT * FROM old_issues,borrowers diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl index 51017a4..1a48b3b 100755 --- a/acqui/orderreceive.pl +++ b/acqui/orderreceive.pl @@ -129,20 +129,20 @@ if ($AcqCreateItem eq 'receiving') { foreach (@itemnumbers) { my $item = GetItem($_); my $av; - $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => $fw, kohafield => 'items.notforloan', authorised_value => $item->{notforloan} }); - $item->{notforloan} = $av->count ? $av->next->lib : ''; + $av = Koha::AuthorisedValues->find_by_koha_field({frameworkcode => $fw, kohafield => 'items.notforloan', authorised_value => $item->{notforloan} }); + $item->{notforloan} = $av ? $av->lib : ''; - $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => $fw, kohafield => 'items.restricted', authorised_value => $item->{restricted} }); - $item->{restricted} = $av->count ? $av->next->lib : ''; + $av = Koha::AuthorisedValues->find_by_koha_field({frameworkcode => $fw, kohafield => 'items.restricted', authorised_value => $item->{restricted} }); + $item->{restricted} = $av ? $av->lib : ''; - $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => $fw, kohafield => 'items.location', authorised_value => $item->{location} }); - $item->{location} = $av->count ? $av->next->lib : ''; + $av = Koha::AuthorisedValues->find_by_koha_field({frameworkcode => $fw, kohafield => 'items.location', authorised_value => $item->{location} }); + $item->{location} = $av ? $av->lib : ''; - $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => $fw, kohafield => 'items.collection', authorised_value => $item->{collection} }); - $item->{collection} = $av->count ? $av->next->lib : ''; + $av = Koha::AuthorisedValues->find_by_koha_field({frameworkcode => $fw, kohafield => 'items.collection', authorised_value => $item->{collection} }); + $item->{collection} = $av ? $av->lib : ''; - $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => $fw, kohafield => 'items.materials', authorised_value => $item->{materials} }); - $item->{materials} = $av->count ? $av->next->lib : ''; + $av = Koha::AuthorisedValues->find_by_koha_field({frameworkcode => $fw, kohafield => 'items.materials', authorised_value => $item->{materials} }); + $item->{materials} = $av ? $av->lib : ''; my $itemtype = getitemtypeinfo($item->{itype}); $item->{itemtype} = $itemtype->{description}; diff --git a/catalogue/getitem-ajax.pl b/catalogue/getitem-ajax.pl index c296257..6974a8f 100755 --- a/catalogue/getitem-ajax.pl +++ b/catalogue/getitem-ajax.pl @@ -56,20 +56,20 @@ if($itemnumber) { } my $av; - $av = Koha::AuthorisedValues->search_by_koha_field({ frameworkcode => $fw, kohafield => 'items.notforloan', authorised_value => $item->{notforloan} }); - $item->{notforloan} = $av->count ? $av->next->lib : ''; + $av = Koha::AuthorisedValues->find_by_koha_field({ frameworkcode => $fw, kohafield => 'items.notforloan', authorised_value => $item->{notforloan} }); + $item->{notforloan} = $av ? $av->lib : ''; - $av = Koha::AuthorisedValues->search_by_koha_field({ frameworkcode => $fw, kohafield => 'items.restricted', authorised_value => $item->{restricted} }); - $item->{restricted} = $av->count ? $av->next->lib : ''; + $av = Koha::AuthorisedValues->find_by_koha_field({ frameworkcode => $fw, kohafield => 'items.restricted', authorised_value => $item->{restricted} }); + $item->{restricted} = $av ? $av->lib : ''; - $av = Koha::AuthorisedValues->search_by_koha_field({ frameworkcode => $fw, kohafield => 'items.location', authorised_value => $item->{location} }); - $item->{location} = $av->count ? $av->next->lib : ''; + $av = Koha::AuthorisedValues->find_by_koha_field({ frameworkcode => $fw, kohafield => 'items.location', authorised_value => $item->{location} }); + $item->{location} = $av ? $av->lib : ''; - $av = Koha::AuthorisedValues->search_by_koha_field({ frameworkcode => $fw, kohafield => 'items.collection', authorised_value => $item->{collection} }); - $item->{collection} = $av->count ? $av->next->lib : ''; + $av = Koha::AuthorisedValues->find_by_koha_field({ frameworkcode => $fw, kohafield => 'items.collection', authorised_value => $item->{collection} }); + $item->{collection} = $av ? $av->lib : ''; - $av = Koha::AuthorisedValues->search_by_koha_field({ frameworkcode => $fw, kohafield => 'items.materials', authorised_value => $item->{materials} }); - $item->{materials} = $av->count ? $av->next->lib : ''; + $av = Koha::AuthorisedValues->find_by_koha_field({ frameworkcode => $fw, kohafield => 'items.materials', authorised_value => $item->{materials} }); + $item->{materials} = $av ? $av->lib : ''; my $itemtype = getitemtypeinfo($item->{itype}); $item->{itemtype} = $itemtype->{description}; diff --git a/circ/circulation.pl b/circ/circulation.pl index ded56c4..340bae7 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -393,8 +393,8 @@ if (@$barcodes) { unless($issueconfirmed){ # Get the item title for more information my $materials = $iteminfo->{'materials'}; - my $av = Koha::AuthorisedValues->search_by_koha_field({ frameworkcode => $getmessageiteminfo->{frameworkcode}, kohafield => 'items.materials', authorised_value => $materials }); - $materials = $av->count ? $av->next->lib : ''; + my $av = Koha::AuthorisedValues->find_by_koha_field({ frameworkcode => $getmessageiteminfo->{frameworkcode}, kohafield => 'items.materials', authorised_value => $materials }); + $materials = $av ? $av->lib : ''; $template_params->{additional_materials} = $materials; $template_params->{itemhomebranch} = $iteminfo->{'homebranch'}; diff --git a/circ/returns.pl b/circ/returns.pl index 619228f..ca56080 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -279,8 +279,8 @@ if ($barcode) { $returnbranch = $biblio->{$hbr}; my $materials = $biblio->{'materials'}; - my $av = Koha::AuthorisedValues->search_by_koha_field({frameworkcode => '', kohafield =>'items.materials', authorised_value => $materials }); - $materials = $av->count ? $av->next->lib : ''; + my $av = Koha::AuthorisedValues->find_by_koha_field({frameworkcode => '', kohafield =>'items.materials', authorised_value => $materials }); + $materials = $av ? $av->lib : ''; $template->param( title => $biblio->{'title'}, -- 2.1.4