From 911fddab4ae403b82b8fc500961332d037bb8523 Mon Sep 17 00:00:00 2001
From: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date: Wed, 19 Nov 2008 14:58:19 +0100
Subject: [PATCH] merge_authority : Bug fixing

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
---
 misc/migration_tools/merge_authority.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/misc/migration_tools/merge_authority.pl b/misc/migration_tools/merge_authority.pl
index 6345c9dff8..b5e64f61ad 100755
--- a/misc/migration_tools/merge_authority.pl
+++ b/misc/migration_tools/merge_authority.pl
@@ -27,7 +27,7 @@ GetOptions(
     'b' => \$batch, 
 );
 
-if ($version || ($mergefrom eq '')) {
+if ($version || ($mergefrom eq '' && !$batch)) {
     print <<EOF
 Script to merge an authority into another
 parameters :
@@ -49,7 +49,6 @@ die;
 }#/'
 
 my $dbh = C4::Context->dbh;
-# my @subf = $subfields =~ /(##\d\d\d##.)/g;
 
 $|=1; # flushes output
 my $authfrom = GetAuthority($mergefrom);
@@ -58,7 +57,7 @@ my $authto = GetAuthority($mergeto);
 my $authtypecodefrom = GetAuthTypeCode($mergefrom);
 my $authtypecodeto = GetAuthTypeCode($mergeto);
 
-unless ($noconfirm) {
+unless ($noconfirm || $batch) {
     print "************\n";
     print "You will merge authority : $mergefrom ($authtypecodefrom)\n".$authfrom->as_formatted;
     print "\n*************\n";
@@ -85,7 +84,8 @@ if ($batch) {
     if ($authid =~ /\.authid$/) {
       $authid =~ s/\.authid$//;
       print "managing $authid\n" if $verbose;
-      my $MARCauth = GetAuthority($authid);
+      my $MARCauth = GetAuthority($authid) ;
+      next unless ($MARCauth);
       merge($authid,$MARCauth,$authid,$MARCauth) if ($MARCauth);
       unlink $cgidir.'/localfile/modified_authorities/'.$authid.'.authid';
     }