Attachment #66278 for bug #17380

View | Details | Raw Unified | Return to bug 17380
Collapse All | Expand All




    return if ($@);
    $record->encoding('UTF-8');

    # NOTE: GuessAuthTypeCode has no business in Koha::MetadataRecord::Authority, which is an
    #       object-oriented class. Eventually perhaps there will be utility
    #       classes in the Koha:: namespace, but there are not at the moment,
    #       so this shim seems like the best option all-around.
    require C4::AuthoritiesMarc;
    $authtypecode ||= C4::AuthoritiesMarc::GuessAuthTypeCode($record);

    my $self = $class->SUPER::new( { authid => $authid,
                                     authtypecode => $authtypecode,
                                     schema => $marcflavour,




use C4::Koha;
use C4::Biblio;

use Koha::Exceptions;

my $input  = new CGI;
my @authid = $input->multi_param('authid');
my $merge  = $input->param('merge');

        push @errors, { code => "WRONG_COUNT", value => scalar(@authid) };
    }
    else {
        my $recordObj1 = Koha::MetadataRecord::Authority->get_from_authid($authid[0]);
        Koha::Exceptions::ObjectNotFound->throw( "No authority record found for authid $authid[0]\n" ) if !$recordObj1;

        my $recordObj2;
        if (defined $mergereference && $mergereference eq 'breeding') {
            $recordObj2 =  Koha::MetadataRecord::Authority->get_from_breeding($authid[1]);
        } else {
            $recordObj2 =  Koha::MetadataRecord::Authority->get_from_authid($authid[1]);
        }
        Koha::Exceptions::ObjectNotFound->throw( "No authority record found for authid $authid[1]\n" ) if !$recordObj2;

        if ($mergereference) {

- 

Return to bug 17380

Lines 93-105 sub get_from_authid { Link Here

(-)a/Koha/MetadataRecord/Authority.pm (-7 lines)
93	return if ($@);	93	return if ($@);
94	$record->encoding('UTF-8');	94	$record->encoding('UTF-8');
95		95
96	# NOTE: GuessAuthTypeCode has no business in Koha::MetadataRecord::Authority, which is an
97	# object-oriented class. Eventually perhaps there will be utility
98	# classes in the Koha:: namespace, but there are not at the moment,
99	# so this shim seems like the best option all-around.
100	require C4::AuthoritiesMarc;
101	$authtypecode \|\|= C4::AuthoritiesMarc::GuessAuthTypeCode($record);
102
103	my $self = $class->SUPER::new( { authid => $authid,	96	my $self = $class->SUPER::new( { authid => $authid,
104	authtypecode => $authtypecode,	97	authtypecode => $authtypecode,
105	schema => $marcflavour,	98	schema => $marcflavour,

Lines 27-32 use Koha::MetadataRecord::Authority; Link Here

(-)a/authorities/merge.pl (-5 / +8 lines)
27	use C4::Koha;	27	use C4::Koha;
28	use C4::Biblio;	28	use C4::Biblio;
29		29
		30	use Koha::Exceptions;
		31
30	my $input = new CGI;	32	my $input = new CGI;
31	my @authid = $input->multi_param('authid');	33	my @authid = $input->multi_param('authid');
32	my $merge = $input->param('merge');	34	my $merge = $input->param('merge');
Lines 87-100 else { Link Here
87	push @errors, { code => "WRONG_COUNT", value => scalar(@authid) };	89	push @errors, { code => "WRONG_COUNT", value => scalar(@authid) };
88	}	90	}
89	else {	91	else {
90	my $recordObj1 = Koha::MetadataRecord::Authority->get_from_authid($authid[0]) \|\| Koha::MetadataRecord::Authority->new();	92	my $recordObj1 = Koha::MetadataRecord::Authority->get_from_authid($authid[0]);
91	my $recordObj2;	93	Koha::Exceptions::ObjectNotFound->throw( "No authority record found for authid $authid[0]\n" ) if !$recordObj1;
92		94
		95	my $recordObj2;
93	if (defined $mergereference && $mergereference eq 'breeding') {	96	if (defined $mergereference && $mergereference eq 'breeding') {
94	$recordObj2 = Koha::MetadataRecord::Authority->get_from_breeding($authid[1]) \|\| Koha::MetadataRecord::Authority->new();	97	$recordObj2 = Koha::MetadataRecord::Authority->get_from_breeding($authid[1]);
95	} else {	98	} else {
96	$recordObj2 = Koha::MetadataRecord::Authority->get_from_authid($authid[1]) \|\| Koha::MetadataRecord::Authority->new();	99	$recordObj2 = Koha::MetadataRecord::Authority->get_from_authid($authid[1]);
97	}	100	}
		101	Koha::Exceptions::ObjectNotFound->throw( "No authority record found for authid $authid[1]\n" ) if !$recordObj2;
98		102
99	if ($mergereference) {	103	if ($mergereference) {
100		104
101	-