Bug 17250 - Koha::AuthorisedValues - Remove GetAuthValCode

[koha.git] / catalogue / itemsearch.pl

diff --git a/catalogue/itemsearch.pl b/catalogue/itemsearch.pl
index 3a5f0d9..001cf28 100755 (executable)
--- a/catalogue/itemsearch.pl
+++ b/catalogue/itemsearch.pl
@@ -27,6 +27,7 @@ use C4::Items;
 use C4::Biblio;
 use C4::Koha;
 
+use Koha::AuthorisedValues;
 use Koha::Item::Search::Field qw(GetItemSearchFields);
 use Koha::ItemTypes;
 use Koha::Libraries;
@@ -87,11 +88,11 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({
     flagsrequired   => { catalogue => 1 },
 });
 
-my $notforloan_avcode = GetAuthValCode('items.notforloan');
-my $notforloan_values = GetAuthorisedValues($notforloan_avcode);
+my $mss = Koha::MarcSubfieldStructures->search({ frameworkcode => '', kohafield => 'items.notforloan' });
+my $notforloan_values = $mss->count ? GetAuthorisedValues($mss->next->authorised_value) : [];
 
-my $location_avcode = GetAuthValCode('items.location');
-my $location_values = GetAuthorisedValues($location_avcode);
+$mss = Koha::MarcSubfieldStructures->search({ frameworkcode => '', kohafield => 'items.location' });
+my $location_values = $mss->count ? GetAuthorisedValues($mss->next->authorised_value) : [];
 
 if (scalar keys %params > 0) {
     # Parameters given, it's a search
@@ -262,7 +263,9 @@ if ($format eq 'html') {
             label => $itemtype->translated_description,
         };
     }
-    my $ccode_avcode = GetAuthValCode('items.ccode') || 'CCODE';
+
+    my $mss = Koha::MarcSubfieldStructures->search({ frameworkcode => '', kohafield => 'items.ccode' });
+    my $ccode_avcode = $mss->count ? $mss->next->authorised_value : 'CCODE';
     my $ccodes = GetAuthorisedValues($ccode_avcode);
     my @ccodes;
     foreach my $ccode (@$ccodes) {