From edd0e444b0e2abc5671eccf9d1587f31f5a60f97 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 3 Aug 2021 14:35:18 +0200 Subject: [PATCH] Bug 17600: Fix GetTagsLabels imports --- authorities/authorities.pl | 6 +++--- authorities/detail-biblio-search.pl | 4 ++-- authorities/detail.pl | 4 ++-- authorities/merge.pl | 2 +- opac/opac-authoritiesdetail.pl | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/authorities/authorities.pl b/authorities/authorities.pl index 33c37aaf4fb..11e60ef3eab 100755 --- a/authorities/authorities.pl +++ b/authorities/authorities.pl @@ -23,7 +23,7 @@ use Modern::Perl; use CGI qw ( -utf8 ); use C4::Auth qw( get_template_and_user ); use C4::Output qw( output_html_with_http_headers ); -use C4::AuthoritiesMarc qw( GetAuthority ); +use C4::AuthoritiesMarc qw( GetAuthority GetTagsLabels GetAuthMARCFromKohaField ); use C4::ImportBatch qw( GetImportRecordMarc ); use C4::Context; use Date::Calc qw( Today ); @@ -600,8 +600,8 @@ my ($oldauthtypetagfield,$oldauthtypetagsubfield); $is_a_modif=0; if ($authid) { $is_a_modif=1; - ($oldauthnumtagfield,$oldauthnumtagsubfield) = &GetAuthMARCFromKohaField("auth_header.authid",$authtypecode); - ($oldauthtypetagfield,$oldauthtypetagsubfield) = &GetAuthMARCFromKohaField("auth_header.authtypecode",$authtypecode); + ($oldauthnumtagfield,$oldauthnumtagsubfield) = GetAuthMARCFromKohaField("auth_header.authid",$authtypecode); + ($oldauthtypetagfield,$oldauthtypetagsubfield) = GetAuthMARCFromKohaField("auth_header.authtypecode",$authtypecode); } $op ||= q{}; #------------------------------------------------------------------------------------------------------------------------------ diff --git a/authorities/detail-biblio-search.pl b/authorities/detail-biblio-search.pl index 0eb510ad9c2..2e8ea40e9af 100755 --- a/authorities/detail-biblio-search.pl +++ b/authorities/detail-biblio-search.pl @@ -39,7 +39,7 @@ parameters tables. use Modern::Perl; use C4::Auth qw( get_template_and_user ); -use C4::AuthoritiesMarc qw( GetAuthority ); +use C4::AuthoritiesMarc qw( GetAuthority GetTagsLabels ); use C4::Context; use C4::Output qw( output_html_with_http_headers ); use CGI qw ( -utf8 ); @@ -56,7 +56,7 @@ my $dbh=C4::Context->dbh; my $authid = $query->param('authid'); my $index = $query->param('index'); my $authtypecode = Koha::Authorities->find($authid)->authtypecode; -my $tagslib = &GetTagsLabels(1,$authtypecode); +my $tagslib = GetTagsLabels(1,$authtypecode); my $record =GetAuthority($authid); # open template diff --git a/authorities/detail.pl b/authorities/detail.pl index 1fefaa9547f..a95460958b3 100755 --- a/authorities/detail.pl +++ b/authorities/detail.pl @@ -39,7 +39,7 @@ parameters tables. use Modern::Perl; use C4::Auth qw( get_template_and_user ); -use C4::AuthoritiesMarc qw( GetAuthority GenerateHierarchy ); +use C4::AuthoritiesMarc qw( GetAuthority GenerateHierarchy GetTagsLabels ); use C4::Context; use C4::Output qw( output_html_with_http_headers ); use CGI qw ( -utf8 ); @@ -181,7 +181,7 @@ my $authid = $query->param('authid'); my $authobj = Koha::Authorities->find($authid); my $authtypecode = $authobj ? $authobj->authtypecode : q{}; -$tagslib = &GetTagsLabels(1,$authtypecode); +$tagslib = GetTagsLabels(1,$authtypecode); # Build list of authtypes for showing them my $authority_types = Koha::Authority::Types->search({}, { order_by => ['authtypetext']}); diff --git a/authorities/merge.pl b/authorities/merge.pl index 9b29f06ee6a..d9af163e793 100755 --- a/authorities/merge.pl +++ b/authorities/merge.pl @@ -21,7 +21,7 @@ use Modern::Perl; use CGI qw ( -utf8 ); use C4::Output qw( output_html_with_http_headers ); use C4::Auth qw( get_template_and_user ); -use C4::AuthoritiesMarc qw( GetAuthority ModAuthority DelAuthority ); +use C4::AuthoritiesMarc qw( GetAuthority ModAuthority DelAuthority GetTagsLabels ); use C4::Biblio qw( TransformHtmlToMarc ); use Koha::Authority::MergeRequests; diff --git a/opac/opac-authoritiesdetail.pl b/opac/opac-authoritiesdetail.pl index 1accfa9c7fa..9acacb16be4 100755 --- a/opac/opac-authoritiesdetail.pl +++ b/opac/opac-authoritiesdetail.pl @@ -42,7 +42,7 @@ use C4::Auth qw( get_template_and_user ); use C4::Biblio qw( GetMarcUrls ); use C4::Context; use C4::Output qw( output_html_with_http_headers ); -use C4::AuthoritiesMarc qw( GetAuthority BuildSummary ); +use C4::AuthoritiesMarc qw( GetAuthority BuildSummary GetTagsLabels ); use CGI qw ( -utf8 ); use C4::Koha; @@ -98,7 +98,7 @@ $template->param( # 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=?" -- 2.20.1