@@ -, +, @@ --- authorities/merge.pl | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) --- a/authorities/merge.pl +++ a/authorities/merge.pl @@ -61,29 +61,13 @@ if ($merge) { # This triggers a merge for the biblios attached to $recordid1 ModAuthority( $recordid1, $record, $typecode ); - # We still need a merge for biblios attached to $recordid2 - if( C4::Context->preference('dontmerge') ne '1' ) { - my $MARCfrom = GetAuthority( $recordid2 ); - &merge( $recordid2, $MARCfrom, $recordid1, $record ); - } else { - my $dbh = C4::Context->dbh; - my $sqlinsert = "INSERT INTO need_merge_authorities (authid, done) VALUES (?,?)"; - $dbh->do( $sqlinsert, undef, ( $recordid1, 0 ) ); - } + # Now merge for biblios attached to $recordid2 + # We ignore dontpref now, since recordid2 is deleted + my $MARCfrom = GetAuthority( $recordid2 ); + &merge( $recordid2, $MARCfrom, $recordid1, $record ); # Deleting the other record - if ( scalar(@errors) == 0 ) { - - my $error; - if ($input->param('mergereference') eq 'breeding') { - require C4::ImportBatch; - C4::ImportBatch::SetImportRecordStatus( $recordid2, 'imported' ); - } else { - C4::AuthoritiesMarc::merge( $recordid2, GetAuthority($recordid2), $recordid1, $record ); - $error = (DelAuthority($recordid2) == 0); - } - push @errors, $error if ($error); - } + DelAuthority( $recordid2 ); # Parameters $template->param( --