From 644d9e938edb60826be98823068db04e38bb6424 Mon Sep 17 00:00:00 2001 From: Mason James Date: Wed, 20 Sep 2017 15:59:11 +1200 Subject: [PATCH] Revert "Bug 17249: Remove GetKohaAuthorisedValuesFromField - (follow-up) inventory" This reverts commit 38cbc453e0cc4a509fe267e32f3903393f449d41. --- t/db_dependent/Items/GetItemsForInventory.t | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/t/db_dependent/Items/GetItemsForInventory.t b/t/db_dependent/Items/GetItemsForInventory.t index dfb2175c2a..32ea963130 100755 --- a/t/db_dependent/Items/GetItemsForInventory.t +++ b/t/db_dependent/Items/GetItemsForInventory.t @@ -137,7 +137,6 @@ sub OldWay { $sth->execute( @bind_params ); my ($iTotalRecords) = $sth->fetchrow_array(); - my $marc_field_mapping; foreach my $row (@$tmpresults) { # Auth values @@ -146,14 +145,9 @@ sub OldWay { my ($f, $sf) = C4::Biblio::GetMarcFromKohaField("items.$field", $row->{'frameworkcode'}); if (defined($f) and defined($sf)) { # We replace the code with it's description - my $avs; - if ( exists $marc_field_mapping->{$row->{frameworkcode}}{$f}{$sf} ) { - $avs = $marc_field_mapping->{$row->{frameworkcode}}{$f}{$sf}; - } else { - $avs = Koha::AuthorisedValues->search_by_marc_field({ frameworkcode => $row->{frameworkcode}, tagfield => $f, tagsubfield => $sf, }); - $marc_field_mapping->{$row->{frameworkcode}}{$f}{$sf} = $avs->unblessed; - } - my $authvals = { map { $_->{authorised_value} => $_->{lib} } @{ $marc_field_mapping->{$row->{frameworkcode}}{$f}{$sf} } }; + my $av = Koha::AuthorisedValues->search_by_marc_field({ frameworkcode => $row->{frameworkcode}, tagfield => $f, tagsubfield => $sf, }); + $av = $av->count ? $av->unblessed : []; + my $authvals = { map { ( $_->{authorised_value} => $_->{lib} ) } @$av }; $row->{$field} = $authvals->{$row->{$field}} if defined $authvals && defined $row->{$field} && defined $authvals->{$row->{$field}}; } } -- 2.39.5