From: Jonathan Druart Date: Wed, 9 Mar 2016 08:20:04 +0000 (+0000) Subject: Bug 16010: follow-up of 15381 - FIX merge_authorities migration script X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=ec3387185dc9d388bf586abd84cfbba2f3153215;hp=99f2feeed94cb88bb14653231735f35c0787cb27;p=koha.git Bug 16010: follow-up of 15381 - FIX merge_authorities migration script Caused by commit 7e70202d34d75f988fbaea9b911347417c203aac Bug 15381: Remove GetAuthType and GetAuthTypeCode If you execute perl misc/migration_tools/merge_authority.pl -f 1 -t 2 you will get: Can't locate object method "authtypecode" via package "1" (perhaps you forgot to load "1"?) at misc/migration_tools/merge_authority.pl line 58. GetAuthority does not return a Koha::Authority but a MARC::Record: there is no authtype code method! Test plan: perl misc/migration_tools/merge_authority.pl -f X -t Y Should not return any error. Note that if the authid X or Y does not exist, the script will die. Signed-off-by: Frédéric Demians Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- diff --git a/misc/migration_tools/merge_authority.pl b/misc/migration_tools/merge_authority.pl index 87a02f9f99..405b66ae14 100755 --- a/misc/migration_tools/merge_authority.pl +++ b/misc/migration_tools/merge_authority.pl @@ -55,8 +55,11 @@ $|=1; # flushes output my $authfrom = GetAuthority($mergefrom); my $authto = GetAuthority($mergeto); -my $authtypecodefrom = $mergefrom->authtypecode; -my $authtypecodeto = $mergeto->authtypecode; +die "Authority $mergefrom does not exist" unless $authfrom; +die "Authority $mergeto does not exist" unless $authto; + +my $authtypecodefrom = Koha::Authorities->find($mergefrom)->authtypecode; +my $authtypecodeto = Koha::Authorities->find($mergeto)->authtypecode; unless ($noconfirm || $batch) { print "************\n";