X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=authorities%2Fdetail-biblio-search.pl;h=717061b2ef59a2968252a164c0c73a8174b34592;hb=2e9165001f69312255ad1b6706f040784460d5d1;hp=b421b805ffa568d1462ae1c9cd3601c1fbc1aa1a;hpb=8b7085a8abd9226f5dbb3cb5b295e4bc9e4b9cba;p=srvgit

diff --git a/authorities/detail-biblio-search.pl b/authorities/detail-biblio-search.pl
index b421b805ff..717061b2ef 100755
--- a/authorities/detail-biblio-search.pl
+++ b/authorities/detail-biblio-search.pl
@@ -4,25 +4,26 @@
 #
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 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
 
-etail.pl : script to show an authority in MARC format
+detail-biblio-search.pl - script to show an authority in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -33,23 +34,24 @@ parameters tables.
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 
 use strict;
-require Exporter;
+use warnings;
+
 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 C4::Biblio;
 # use C4::Catalogue;
 
+use Koha::Authorities;
+use Koha::Authority::Types;
 
 my $query=new CGI;
 
@@ -57,28 +59,28 @@ my $dbh=C4::Context->dbh;
 
 my $authid = $query->param('authid');
 my $index = $query->param('index');
-my $authtypecode = &GetAuthTypeCode($authid);
+my $authtypecode = Koha::Authorities->find($authid)->authtypecode;
 my $tagslib = &GetTagsLabels(1,$authtypecode);
 
 my $record =GetAuthority($authid);
 # open template
-my ($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/detail-biblio-search.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {catalogue => 1},
-			     debug => 1,
-			     });
+my ($template, $loggedinuser, $cookie) = get_template_and_user(
+    {
+        template_name   => "authorities/detail-biblio-search.tt",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { catalogue => 1 },
+        debug           => 1,
+    }
+);
 
 # fill arrays
 my @loop_data =();
-my $tag;
 # loop through each tab 0 through 9
 # for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
 # loop through each tag
-	my @fields = $record->fields();
-	my @loop_data =();
+my @fields = $record->fields();
 	foreach my $field (@fields) {
 			my @subfields_data;
 		# if tag <10, there's no subfield, use the "@" trick
@@ -95,7 +97,7 @@ my $tag;
 			my @subf=$field->subfields;
 	# loop through each subfield
 			for my $i (0..$#subf) {
-				$subf[$i][0] = "@" unless $subf[$i][0];
+				$subf[$i][0] = "@" unless defined $subf[$i][0];
 # 				next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab}  ne $tabloop);
 				next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{hidden});
 				my %subfield_data;
@@ -119,19 +121,12 @@ my $tag;
 	}
 	$template->param("0XX" =>\@loop_data);
 
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype (keys %$authtypes) {
-	my $selected = 1 if $thisauthtype eq $authtypecode;
-	my %row =(value => $thisauthtype,
-				selected => $selected,
-				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-			);
-	push @authtypesloop, \%row;
-}
-
-$template->param(authid => $authid,
-		authtypesloop => \@authtypesloop, index => $index,
-		);
+my $authority_types = Koha::Authority::Types->search( {}, { order_by => ['authtypetext'] } );
+
+$template->param(
+    authid          => $authid,
+    authority_types => $authority_types,
+    index           => $index,
+);
 output_html_with_http_headers $query, $cookie, $template->output;