X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=authorities%2Fdetail.pl;h=a95460958b3d76f3680983d2f5bb6a97776edc9d;hb=c89c25d81aa8d6a2500820b84aaf7a5c157ed815;hp=d4f2c6730c76f19fb0aeefebdfd7fe5558066eff;hpb=48d62dccfde25a7e19f662c94ecd37e7c69f289f;p=koha-ffzg.git diff --git a/authorities/detail.pl b/authorities/detail.pl index d4f2c6730c..a95460958b 100755 --- a/authorities/detail.pl +++ b/authorities/detail.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 . =head1 NAME @@ -36,17 +36,19 @@ parameters tables. =cut +use Modern::Perl; -use strict; -use warnings; - -use C4::AuthoritiesMarc; -use C4::Auth; +use C4::Auth qw( get_template_and_user ); +use C4::AuthoritiesMarc qw( GetAuthority GenerateHierarchy GetTagsLabels ); use C4::Context; -use C4::Output; -use CGI; -use MARC::Record; +use C4::Output qw( output_html_with_http_headers ); +use CGI qw ( -utf8 ); use C4::Koha; +use Koha::Authorities; + +use Koha::Authority::Types; +use Koha::Token; +use Koha::Z3950Servers; our ($tagslib); @@ -106,7 +108,7 @@ sub build_tabs { 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} @@ -117,7 +119,8 @@ sub build_tabs { my %subfield_data; $subfield_data{marc_lib}=$tagslib->{$field->tag()}->{$subf[$i][0]}->{lib}; if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{isurl}) { - $subfield_data{marc_value}="$subf[$i][1]"; + $subfield_data{marc_value} = $subf[$i][1]; + $subfield_data{is_url} = 1; } else { $subfield_data{marc_value}=$subf[$i][1]; } @@ -134,11 +137,15 @@ sub build_tabs { } if ($#subfields_data>=0) { my %tag_data; - $tag_data{tag}=$field->tag(). ' ' - . C4::Koha::display_marc_indicators($field) - . ' - ' - . $tagslib->{$field->tag()}->{lib}; + $tag_data{tag_number} = $tag; + $tag_data{tag_desc} = $tagslib->{$field->tag()}->{lib}; $tag_data{subfield} = \@subfields_data; + my $indicators = C4::Koha::display_marc_indicators($field); + if ( $indicators ) { + $tag_data{ind1} = substr $indicators, 0, 1; + $tag_data{ind2} = substr $indicators, 1, 1; + } + push (@loop_data, \%tag_data); } } @@ -156,37 +163,28 @@ sub build_tabs { # -my $query=new CGI; +my $query=CGI->new; my $dbh=C4::Context->dbh; # open template -my ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "authorities/detail.tmpl", - query => $query, - type => "intranet", - authnotrequired => 0, - flagsrequired => {catalogue => 1}, - debug => 1, - }); +my ($template, $loggedinuser, $cookie) = get_template_and_user( + { + template_name => "authorities/detail.tt", + query => $query, + type => "intranet", + flagsrequired => { catalogue => 1 }, + } +); my $authid = $query->param('authid'); -# Using default authtypecode, so all fields are seen -my $authtypecode = ''; -$tagslib = &GetTagsLabels(1,$authtypecode); +my $authobj = Koha::Authorities->find($authid); +my $authtypecode = $authobj ? $authobj->authtypecode : q{}; +$tagslib = GetTagsLabels(1,$authtypecode); # Build list of authtypes for showing them -my $authtypes = getauthtypes; -my @authtypesloop; - -foreach my $thisauthtype (sort { $authtypes->{$b} cmp $authtypes->{$a} } keys %$authtypes) { - my %row =(value => $thisauthtype, - selected => $thisauthtype eq $authtypecode, - authtypetext => $authtypes->{$thisauthtype}{'authtypetext'}, - ); - push @authtypesloop, \%row; -} +my $authority_types = Koha::Authority::Types->search({}, { order_by => ['authtypetext']}); my $record=GetAuthority($authid); @@ -194,36 +192,17 @@ if (not defined $record) { # authid invalid $template->param ( errauthid => $authid, unknownauthid => 1, - authtypesloop => \@authtypesloop ); + authority_types => $authority_types, ); output_html_with_http_headers $query, $cookie, $template->output; exit; } if (C4::Context->preference("AuthDisplayHierarchy")){ - my $trees=BuildUnimarcHierarchies($authid); - my @trees = split /;/,$trees ; - push @trees,$trees unless (@trees); - my @loophierarchies; - foreach my $tree (@trees){ - my @tree=split /,/,$tree; - push @tree,$tree unless (@tree); - my $cnt=0; - my @loophierarchy; - foreach my $element (@tree){ - my $elementdata = GetAuthority($element); - $record= $elementdata if ($authid==$element); - push @loophierarchy, BuildUnimarcHierarchy($elementdata,"child".$cnt, $authid); - $cnt++; - } - push @loophierarchies, { 'loopelement' =>\@loophierarchy}; - } - $template->param( - 'displayhierarchy' =>C4::Context->preference("AuthDisplayHierarchy"), - 'loophierarchies' =>\@loophierarchies, - ); + $template->{VARS}->{'displayhierarchy'} = C4::Context->preference("AuthDisplayHierarchy"); + $template->{VARS}->{'loophierarchies'} = GenerateHierarchy($authid); } -my $count = CountUsage($authid); +my $count = $authobj ? $authobj->get_usage_count : 0; # find the marc field/subfield used in biblio by this authority my $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where authtypecode=?"); @@ -232,15 +211,29 @@ my $biblio_fields; while (my ($tagfield) = $sth->fetchrow) { $biblio_fields.= $tagfield."9,"; } -chop $biblio_fields; +chop $biblio_fields if $biblio_fields; build_tabs ($template, $record, $dbh,"",$query); -$template->param(authid => $authid, - count => $count, - biblio_fields => $biblio_fields, - authtypetext => $authtypes->{$authtypecode}{'authtypetext'}, - authtypesloop => \@authtypesloop, - ); +my $servers = Koha::Z3950Servers->search( + { + recordtype => 'authority', + servertype => ['zed', 'sru'], + }, +); + +my $type = $authority_types->find($authtypecode); +$template->param( + authid => $authid, + count => $count, + biblio_fields => $biblio_fields, + authtypetext => $type ? $type->authtypetext: "", + authtypecode => $authtypecode, + authority_types => $authority_types, + csrf_token => Koha::Token->new->generate_csrf({ session_id => scalar $query->cookie('CGISESSID') }), + servers => $servers, +); + +$template->{VARS}->{marcflavour} = C4::Context->preference("marcflavour"); output_html_with_http_headers $query, $cookie, $template->output;