From a00019c1805ed04f87365d6bf86fa6f0b4ce0f91 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Fri, 18 Nov 2022 17:36:47 -1000 Subject: [PATCH] Bug 32279: Add GetAuthorizedHeading method export C4::AuthoritiesMarc C4::AuthoritiesMarc method GetAuthorizedHeading is not exported thus it is called in other modules : > git grep GetAuthorizedHeading C4/AuthoritiesMarc.pm:=head2 GetAuthorizedHeading C4/AuthoritiesMarc.pm: $heading = &GetAuthorizedHeading({ record => $record, authid => $authid }) C4/AuthoritiesMarc.pm:sub GetAuthorizedHeading { C4/Breeding.pm: $heading = C4::AuthoritiesMarc::GetAuthorizedHeading({ record => $marcrecord }); C4/ImportBatch.pm: $row->{'authorized_heading'} = C4::AuthoritiesMarc::GetAuthorizedHeading( { authid => $row->{'candidate_match_id'} } ); C4/ImportBatch.pm: my $authorized_heading = C4::AuthoritiesMarc::GetAuthorizedHeading({ record => $marc_record }); This patch adds it to be exported. For example for use in Koha plugins. Test plan : Check import of authorities from a file is OK Signed-off-by: Phil Ringnalda Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 2d0eca8a0df0e34535d12e40c4247ec99a493619) Signed-off-by: Jacob O'Mara (cherry picked from commit 6833e1b3f70a356bc9ba6ae50ed048324e60664f) Signed-off-by: Lucas Gass (cherry picked from commit 6a67b16baafb7c1cc53bfe080a86835238977c52) Signed-off-by: Arthur Suzuki --- C4/AuthoritiesMarc.pm | 1 + C4/Breeding.pm | 4 ++-- C4/ImportBatch.pm | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index c968eaa1e1..1efd7a9998 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -53,6 +53,7 @@ BEGIN { DelAuthority GetAuthority GetAuthorityXML + GetAuthorizedHeading SearchAuthorities diff --git a/C4/Breeding.pm b/C4/Breeding.pm index d0d6f81f5a..4a901c838f 100644 --- a/C4/Breeding.pm +++ b/C4/Breeding.pm @@ -27,7 +27,7 @@ use C4::Charset qw( MarcToUTF8Record SetUTF8Flag ); use MARC::File::USMARC; use MARC::Field; use C4::ImportBatch qw( GetZ3950BatchId AddBiblioToBatch AddAuthToBatch ); -use C4::AuthoritiesMarc qw( GuessAuthTypeCode ); +use C4::AuthoritiesMarc qw( GuessAuthTypeCode GetAuthorizedHeading ); use C4::Languages; use Koha::Database; use Koha::XSLT::Base; @@ -609,7 +609,7 @@ sub Z3950SearchAuth { $heading_authtype_code = GuessAuthTypeCode($marcrecord); next if ( not defined $heading_authtype_code ) ; - $heading = C4::AuthoritiesMarc::GetAuthorizedHeading({ record => $marcrecord }); + $heading = GetAuthorizedHeading({ record => $marcrecord }); my $breedingid = ImportBreedingAuth( $marcrecord, $serverhost[$k], $encoding[$k], $heading ); my %row_data; diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm index fe0b2054ef..68c16b7c90 100644 --- a/C4/ImportBatch.pm +++ b/C4/ImportBatch.pm @@ -32,7 +32,7 @@ use C4::Biblio qw( ); use C4::Items qw( AddItemFromMarc ModItemFromMarc ); use C4::Charset qw( MarcToUTF8Record SetUTF8Flag StripNonXmlChars ); -use C4::AuthoritiesMarc qw( AddAuthority GuessAuthTypeCode GetAuthorityXML ModAuthority DelAuthority ); +use C4::AuthoritiesMarc qw( AddAuthority GuessAuthTypeCode GetAuthorityXML ModAuthority DelAuthority GetAuthorizedHeading ); use C4::MarcModificationTemplates qw( ModifyRecordWithTemplate ); use Koha::Items; use Koha::Plugins::Handler; @@ -1472,7 +1472,7 @@ sub GetImportRecordMatches { $sth->execute(); while (my $row = $sth->fetchrow_hashref) { if ($row->{'record_type'} eq 'auth') { - $row->{'authorized_heading'} = C4::AuthoritiesMarc::GetAuthorizedHeading( { authid => $row->{'candidate_match_id'} } ); + $row->{'authorized_heading'} = GetAuthorizedHeading( { authid => $row->{'candidate_match_id'} } ); } next if ($row->{'record_type'} eq 'biblio' && not $row->{'biblionumber'}); push @$results, $row; @@ -1637,7 +1637,7 @@ sub _add_auth_fields { if ($marc_record->field('001')) { $controlnumber = $marc_record->field('001')->data(); } - my $authorized_heading = C4::AuthoritiesMarc::GetAuthorizedHeading({ record => $marc_record }); + my $authorized_heading = GetAuthorizedHeading({ record => $marc_record }); my $dbh = C4::Context->dbh; my $sth = $dbh->prepare("INSERT INTO import_auths (import_record_id, control_number, authorized_heading) VALUES (?, ?, ?)"); $sth->execute($import_record_id, $controlnumber, $authorized_heading); -- 2.39.5