#
# 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
=cut
-use strict;
-use warnings;
+use Modern::Perl;
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 Koha::Authorities;
+use Koha::Authority::Types;
my $query = new CGI;
);
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 $authtypecode = &GetAuthTypeCode( $authid );
+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 $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'] } );
+$template->param(
+ authority_types => $authority_types,
+ authtypetext => $authority_types->find($authtypecode)->authtypetext,
+ authid => $authid,
+ count => $count,
+);
# find the marc field/subfield used in biblio by this authority
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 C4::Context->preference('marcflavour') eq 'UNIMARC' && $field->tag() <200;
# if tag <10, there's no subfield, use the "@" trick
if ( $field->tag() < 10 ) {
$subfield_data{marc_tag} = $field->tag();
push( @subfields_data, \%subfield_data );
}
+ elsif ( C4::Context->preference('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;