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

(-)a/C4/AuthoritiesMarc.pm (-1 / +5 lines)
Lines 1512-1518 sub merge { Link Here
1512
        }
1512
        }
1513
    }#foreach $marc
1513
    }#foreach $marc
1514
1514
1515
    DelAuthority($mergefrom) if ($mergefrom != $mergeto);
1515
    if ( $mergefrom != $mergeto ) {
1516
        my $number_of_authorities_deleted = DelAuthority($mergefrom);
1517
        die "Authority $mergefrom has not been deleted"
1518
          if $number_of_authorities_deleted == 0;
1519
    }
1516
1520
1517
    return @editedbiblios;
1521
    return @editedbiblios;
1518
}
1522
}
(-)a/authorities/merge.pl (-5 / +4 lines)
Lines 63-77 if ($merge) { Link Here
63
    # Deleting the other record
63
    # Deleting the other record
64
    if ( scalar(@errors) == 0 ) {
64
    if ( scalar(@errors) == 0 ) {
65
65
66
        my $error;
67
        if ($input->param('mergereference') eq 'breeding') {
66
        if ($input->param('mergereference') eq 'breeding') {
68
            require C4::ImportBatch;
67
            require C4::ImportBatch;
69
            C4::ImportBatch::SetImportRecordStatus( $recordid2, 'imported' );
68
            C4::ImportBatch::SetImportRecordStatus( $recordid2, 'imported' );
70
        } else {
69
        } else {
71
            C4::AuthoritiesMarc::merge( $recordid2, GetAuthority($recordid2), $recordid1, $record );
70
            eval {
72
            $error = (DelAuthority($recordid2) == 0);
71
                C4::AuthoritiesMarc::merge( $recordid2, GetAuthority($recordid2), $recordid1, $record );
72
            };
73
            push @errors, 1 if $@;
73
        }
74
        }
74
        push @errors, $error if ($error);
75
    }
75
    }
76
76
77
    # Parameters
77
    # Parameters
78
- 

Return to bug 11700