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

(-)a/C4/AuthoritiesMarc.pm (-1 / +4 lines)
Lines 1551-1557 sub merge { Link Here
1551
        }
1551
        }
1552
    }#foreach $marc
1552
    }#foreach $marc
1553
1553
1554
    DelAuthority($mergefrom) if ($mergefrom != $mergeto);
1554
    if ($mergefrom != $mergeto) {
1555
        my $number_of_authorities_deleted = DelAuthority($mergefrom);
1556
        die "Authority $mergefrom has not been deleted";
1557
    }
1555
1558
1556
    return @editedbiblios;
1559
    return @editedbiblios;
1557
}
1560
}
(-)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