X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-authoritiesdetail.pl;h=08d0369225c5cfb6c8bec24a4b68fc5ea303b7de;hb=98b221ca2b0c3b046fa4105a83ce4d60d43e36bc;hp=278db999c7e1a9542aa353858db8b129f8aabd4e;hpb=b2b16fb8cf4bf89862eba6fc14d507dc79de4db7;p=koha.git

diff --git a/opac/opac-authoritiesdetail.pl b/opac/opac-authoritiesdetail.pl
index 278db999c7..08d0369225 100755
--- a/opac/opac-authoritiesdetail.pl
+++ b/opac/opac-authoritiesdetail.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
 
@@ -36,23 +36,26 @@ parameters tables.
 
 =cut
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use C4::AuthoritiesMarc;
 use C4::Auth;
+use C4::Biblio qw(GetMarcUrls);
 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;
 
 my $display_hierarchy = C4::Context->preference("AuthDisplayHierarchy");
+my $marcflavour       = C4::Context->preference("marcflavour");
 my $show_marc = $query->param('marc');
 
 # open template
@@ -66,53 +69,34 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $authid       = $query->param('authid');
-my $authtypecode = &GetAuthTypeCode( $authid );
+my $authid = $query->param('authid');
+$authid = int($authid);
+my $record = GetAuthority( $authid );
+if ( ! $record ) {
+    print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early
+    exit;
+}
+
+my $authority = Koha::Authorities->find( $authid );
+my $authtypecode = $authority ? $authority->authtypecode : q{};
 
-my $record;
 if ($display_hierarchy){
-  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 $cell;
-      my $elementdata = GetAuthority($element);
-      $record= $elementdata if ($authid==$element);
-      push @loophierarchy, BuildUnimarcHierarchy($elementdata,"child".$cnt, $authid);
-      $cnt++;
-    }
-    push @loophierarchies, { 'loopelement' =>\@loophierarchy};
-  }
-  $template->param(
-    'displayhierarchy' => $display_hierarchy,
-    'loophierarchies' =>\@loophierarchies,
-  );
+    $template->{VARS}->{'displayhierarchy'} = $display_hierarchy;
+    $template->{VARS}->{'loophierarchies'} = GenerateHierarchy($authid);
 }
-else {
-    $record = GetAuthority( $authid );
-}
-my $count = CountUsage($authid);
 
+my $count = $authority ? $authority->get_usage_count : 0;
 
-my $authtypes     = getauthtypes();
-my @authtypesloop = ();
-foreach my $thisauthtype ( keys %{$authtypes} ) {
-    push @authtypesloop,
-         { value        => $thisauthtype,
-           selected     => $thisauthtype eq $authtypecode,
-           authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-         };
-}
-$template->{VARS}->{'authtypesloop'} = \@authtypesloop;
-$template->{VARS}->{'authtypetext'}  = $authtypes->{$authtypecode}{'authtypetext'};
-$template->{VARS}->{'authid'}        = $authid;
-$template->{VARS}->{'count'}         = $count;
+my $authority_types = Koha::Authority::Types->search( {}, { order_by => ['authtypecode'] } );
+my $marcurlsarray = GetMarcUrls( $record, $marcflavour );
+
+$template->param(
+    authority_types => $authority_types,
+    authtypetext    => $authority_types->find($authtypecode)->authtypetext,
+    authid          => $authid,
+    count           => $count,
+    MARCURLS        => $marcurlsarray,
+);
 
 # find the marc field/subfield used in biblio by this authority
 if ($show_marc) {
@@ -138,7 +122,7 @@ if ($show_marc) {
         my @subfields_data;
 
 # skip UNIMARC fields <200, they are useless for a patron
-        next if C4::Context->preference('MarcFlavour') eq 'UNIMARC' && $field->tag() <200;
+        next if $marcflavour eq 'UNIMARC' && $field->tag() <200;
 
 # if tag <10, there's no subfield, use the "@" trick
         if ( $field->tag() < 10 ) {
@@ -150,12 +134,15 @@ if ($show_marc) {
             $subfield_data{marc_tag}      = $field->tag();
             push( @subfields_data, \%subfield_data );
         }
+        elsif ( $marcflavour eq 'MARC21' && $field->tag() eq 667 ) {
+            # tagfield 667 is a nonpublic general note in MARC21, which shouldn't be shown in the OPAC
+        }
         else {
             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] }->{hidden} );
 # skip useless subfields (for patrons)
                 next if $subf[$i][0] =~ /7|8|9/;
@@ -187,4 +174,3 @@ if ($show_marc) {
 }
 
 output_html_with_http_headers $query, $cookie, $template->output;
-