Bug 30952: Fix toolbar positioning and spacing

[koha-ffzg.git] / opac / opac-authoritiesdetail.pl

diff --git a/opac/opac-authoritiesdetail.pl b/opac/opac-authoritiesdetail.pl
index b867012..e6d41f7 100755 (executable)
--- a/opac/opac-authoritiesdetail.pl
+++ b/opac/opac-authoritiesdetail.pl
@@ -36,24 +36,25 @@ parameters tables.
 
 =cut
 
-use strict;
-use warnings;
+use Modern::Perl;
 
-use C4::AuthoritiesMarc;
-use C4::Auth;
+use C4::Auth qw( get_template_and_user );
+use C4::Biblio qw( GetMarcUrls );
 use C4::Context;
-use C4::Output;
+use C4::Output qw( output_html_with_http_headers );
+use C4::AuthoritiesMarc qw( GetAuthority BuildSummary GetTagsLabels GenerateHierarchy );
 use CGI qw ( -utf8 );
-use MARC::Record;
 use C4::Koha;
 
+use Koha::Authorities;
 use Koha::Authority::Types;
 
-my $query = new CGI;
+my $query = CGI->new;
 
 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
@@ -63,7 +64,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
-        debug           => 1,
     }
 );
 
@@ -75,26 +75,30 @@ if ( ! $record ) {
     exit;
 }
 
-my $authtypecode = $record->authtypecode;
+my $authority = Koha::Authorities->find( $authid );
+my $authtypecode = $authority ? $authority->authtypecode : q{};
 
 if ($display_hierarchy){
     $template->{VARS}->{'displayhierarchy'} = $display_hierarchy;
     $template->{VARS}->{'loophierarchies'} = GenerateHierarchy($authid);
 }
 
-my $count = CountUsage($authid);
+my $count = $authority ? $authority->get_usage_count : 0;
 
 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) {
-    my $tagslib = &GetTagsLabels( 0, $authtypecode );
+    my $tagslib = GetTagsLabels( 0, $authtypecode );
     my $sth =
         $dbh->prepare(
                 "select distinct tagfield from marc_subfield_structure where authtypecode=?"
@@ -108,7 +112,6 @@ if ($show_marc) {
 
 # fill arrays
     my @loop_data = ();
-    my $tag;
 
 # loop through each tag
     my @fields    = $record->fields();
@@ -116,7 +119,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 ) {
@@ -128,7 +131,7 @@ if ($show_marc) {
             $subfield_data{marc_tag}      = $field->tag();
             push( @subfields_data, \%subfield_data );
         }
-        elsif ( C4::Context->preference('marcflavour') eq 'MARC21' && $field->tag() eq 667 ) {
+        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 {
@@ -165,6 +168,12 @@ if ($show_marc) {
 } else {
     my $summary = BuildSummary($record, $authid, $authtypecode);
     $template->{VARS}->{'summary'} = $summary;
+
+    if ( C4::Context->preference('OPACAuthorIdentifiers') ) {
+        my $authority = Koha::Authorities->find($authid);
+        my $identifiers = $authority->get_identifiers;
+        $template->param( author_identifiers => $identifiers );
+    }
 }
 
 output_html_with_http_headers $query, $cookie, $template->output;