Bug 19537: (QA follow-up) Consistent structures

[koha.git] / authorities / blinddetail-biblio-search.pl

diff --git a/authorities/blinddetail-biblio-search.pl b/authorities/blinddetail-biblio-search.pl
index d0f4069..9e7930d 100755 (executable)
--- a/authorities/blinddetail-biblio-search.pl
+++ b/authorities/blinddetail-biblio-search.pl
@@ -4,18 +4,18 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 =head1 NAME
 
@@ -43,10 +43,13 @@ use C4::AuthoritiesMarc;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use CGI;
+use CGI qw ( -utf8 );
 use MARC::Record;
 use C4::Koha;
 
+use Koha::Authorities;
+use Koha::Authority::Types;
+
 my $query = new CGI;
 
 my $dbh = C4::Context->dbh;
@@ -55,14 +58,6 @@ my $authid       = $query->param('authid');
 my $index        = $query->param('index');
 my $tagid        = $query->param('tagid');
 my $relationship = $query->param('relationship');
-my $authtypecode = &GetAuthTypeCode($authid);
-my $tagslib      = &GetTagsLabels( 1, $authtypecode );
-
-my $auth_type = GetAuthType($authtypecode);
-my $record;
-if ($authid) {
-    $record = GetAuthority($authid);
-}
 
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -79,7 +74,10 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 my @subfield_loop;
 my ($indicator1, $indicator2);
 if ($authid) {
-    my @fields = $record->field( $auth_type->{auth_tag_to_report} );
+    my $authtypecode = Koha::Authorities->find($authid)->authtypecode;
+    my $auth_type = Koha::Authority::Types->find($authtypecode);
+    my $record = GetAuthority($authid);
+    my @fields = $record->field( $auth_type->auth_tag_to_report );
     my $repet = ($query->param('repet') || 1) - 1;
     my $field = $fields[$repet];
 
@@ -104,7 +102,7 @@ if ($authid) {
         $indicator1 = $field->indicator('1');
         $indicator2 = $field->indicator('2');
     } elsif (C4::Context->preference('marcflavour') eq 'MARC21') {
-        my $tag_from = $auth_type->{auth_tag_to_report};
+        my $tag_from = $auth_type->auth_tag_to_report;
         my $tag_to = $index;
         $tag_to =~ s/^tag_(\d*)_.*$/$1/;
         if ($tag_to =~ /^6/) {  # subject heading
@@ -124,9 +122,9 @@ if ($authid) {
             $indicator2 = defined $thes_mapping{$thes_008_11} ? $thes_mapping{$thes_008_11} : $thes_008_11;
             if ($indicator2 eq '7') {
                 if ($thes_008_11 eq 'r') {
-                    $subfields{'2'} = ['aat'];
+                    push @subfield_loop, { marc_subfield => '2', marc_values => [ 'aat' ] };
                 } elsif ($thes_008_11 eq 's') {
-                    $subfields{'2'} = ['sears'];
+                    push @subfield_loop, { marc_subfield => '2', marc_values => [ 'sears' ] };
                 }
             }
         }