X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=authorities%2Fdetail-biblio-search.pl;h=d4dc693664e370cfbc4af1a36810f8fa12743db7;hb=0313856d9a1a9c0c002da0aead8c8516b51e1c11;hp=5bfe7620a0d112ae712c6a6980974051cb7d474b;hpb=cbf218c28ed95e0c579cffff6dadf16e3821a180;p=koha_fer

diff --git a/authorities/detail-biblio-search.pl b/authorities/detail-biblio-search.pl
index 5bfe7620a0..d4dc693664 100755
--- a/authorities/detail-biblio-search.pl
+++ b/authorities/detail-biblio-search.pl
@@ -13,16 +13,17 @@
 # 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =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,25 +34,22 @@ 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 C4::Interface::CGI::Output;
 use CGI;
-use C4::Search;
 use MARC::Record;
 use C4::Koha;
 # use C4::Biblio;
 # use C4::Catalogue;
-use HTML::Template;
+
 
 my $query=new CGI;
 
@@ -59,10 +57,10 @@ my $dbh=C4::Context->dbh;
 
 my $authid = $query->param('authid');
 my $index = $query->param('index');
-my $authtypecode = &AUTHfind_authtypecode($dbh,$authid);
-my $tagslib = &AUTHgettagslib($dbh,1,$authtypecode);
+my $authtypecode = &GetAuthTypeCode($authid);
+my $tagslib = &GetTagsLabels(1,$authtypecode);
 
-my $record =AUTHgetauthority($dbh,$authid);
+my $record =GetAuthority($authid);
 # open template
 my ($template, $loggedinuser, $cookie)
 		= get_template_and_user({template_name => "authorities/detail-biblio-search.tmpl",
@@ -75,12 +73,10 @@ my ($template, $loggedinuser, $cookie)
 
 # 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
@@ -97,7 +93,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;
@@ -120,65 +116,19 @@ my $tag;
 		}
 	}
 	$template->param("0XX" =>\@loop_data);
-# }
-# now, build item tab !
-# the main difference is that datas are in lines and not in columns : thus, we build the <th> first, then the values...
-# loop through each tag
-# warning : we may have differents number of columns in each row. Thus, we first build a hash, complete it if necessary
-# then construct template.
-# my @fields = $record->fields();
-# my %witness; #---- stores the list of subfields used at least once, with the "meaning" of the code
-# my @big_array;
-# foreach my $field (@fields) {
-# 	next if ($field->tag()<10);
-# 	my @subf=$field->subfields;
-# 	my %this_row;
-# # loop through each subfield
-# 	for my $i (0..$#subf) {
-# 		next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab}  ne 10);
-# 		$witness{$subf[$i][0]} = $tagslib->{$field->tag()}->{$subf[$i][0]}->{lib};
-# 		$this_row{$subf[$i][0]} =$subf[$i][1];
-# 	}
-# 	if (%this_row) {
-# 		push(@big_array, \%this_row);
-# 	}
-# }
-# #fill big_row with missing datas
-# foreach my $subfield_code  (keys(%witness)) {
-# 	for (my $i=0;$i<=$#big_array;$i++) {
-# 		$big_array[$i]{$subfield_code}="&nbsp;" unless ($big_array[$i]{$subfield_code});
-# 	}
-# }
-# # now, construct template !
-# my @item_value_loop;
-# my @header_value_loop;
-# for (my $i=0;$i<=$#big_array; $i++) {
-# 	my $items_data;
-# 	foreach my $subfield_code (keys(%witness)) {
-# 		$items_data .="<td>".$big_array[$i]{$subfield_code}."</td>";
-# 	}
-# 	my %row_data;
-# 	$row_data{item_value} = $items_data;
-# 	push(@item_value_loop,\%row_data);
-# }
-# foreach my $subfield_code (keys(%witness)) {
-# 	my %header_value;
-# 	$header_value{header_value} = $witness{$subfield_code};
-# 	push(@header_value_loop, \%header_value);
-# }
 
 my $authtypes = getauthtypes;
 my @authtypesloop;
 foreach my $thisauthtype (keys %$authtypes) {
-	my $selected = 1 if $thisauthtype eq $authtypecode;
 	my %row =(value => $thisauthtype,
-				selected => $selected,
+				selected => $thisauthtype eq $authtypecode,
 				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
 			);
 	push @authtypesloop, \%row;
 }
 
 $template->param(authid => $authid,
-				authtypesloop => \@authtypesloop, index => $index);
+		authtypesloop => \@authtypesloop, index => $index,
+		);
 output_html_with_http_headers $query, $cookie, $template->output;