[koha-commits] main Koha release repository branch master updated. v16.11.00-462-gf0e7a12

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  f0e7a120ced84b4577f90d2e1879289c02b69bcd (commit)
      from  c5901cad450e8a869e7b53347cc6dbf4604f7a90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f0e7a120ced84b4577f90d2e1879289c02b69bcd
Author: remi <remi.mayrand-provencher at inLibro.com>
Date:   Wed Mar 9 11:48:31 2016 -0500

    Bug 16018: Merge.pl code cleanup
    
    Original patch from Remi Mayrand-Provencher.
    Amended by Marcel de Rooy (January 2017), part of omnibus bug 17908.
    
    EDIT:
    We cannot remove the ModAuthority call, since the reference record is
    the result of the merge and should be saved.
    Variable $overwrite is not used and can be removed.
    
    It is not useful to postpone a merge to the cron job here, since the
    old authority record is deleted. (Note that bug 9988 will address this
    subject too.)
    
    Removing the call to C4::ImportBatch::SetImportRecordStatus: Since
    $recordid2 is not an import_record_id, this is useless and potentially wrong.
    Removed the if statement for @errors, since it is not used at this point;
    putting the result of a comparison into $error is not useful either.
    
    Note: there is a lot of code in merge.pl around breeding that is actually
    unused. Template tools/manage-marc-import.tt contains two unused blocks
    final_match_link and match_link that contain a (unreachable) call to
    authorities/merge.pl with parameters:
    mergereference=breeding&authid=[% record_lis.match_id %]&authid=[% record_lis.import_record_id %]
    It seems that this would show the records correctly, but would not merge
    them correctly since that code expects two authority records.
    
    Leaving the signoff of Mehdi since he essentially tested the merge call.
    
    Test plan:
    [1] Restart Plack and restart koha-indexer. (I had some problems related to
        indexing as a result of the marcxml transition.)
    [2] Go to Authorities.
        Select two authorities to merge, start with two of the same type.
        Make sure that both are used in a few biblio records.
        Select at least one subfield from the authority to be removed for
        inclusion in the authority to be kept ("reference record").
    [3] Click Merge. You come back to the kept authority record.
        Note: The number of attached records may not yet be updated. This depends
        on the speed of koha-indexer. If you wait a bit and refresh, you should
        have the correct number.
        First check the authority record again for the inserted subfield.
        Now check a biblio that was ALREADY attached to the reference record.
        And check a biblio that was FORMERLY attached to the deleted one.
        Note: See bug 17913 to see how pref AuthorityMergeMode impacts this.
    [4] Try steps 2 and 3 again for a merge of two authority records that do not
        have the same authority type noting the remarks below.
        For instance try to merge from a CORPO_NAME to a PERSO_NAME record.
        Make a change in say 040$a of the record to be deleted. And select that
        field later on the merge form.
        Normally, you would use the PERSO_NAME framework in the merge now.
        When checking the authority record, look at 040a. When checking the
        record that was linked to the CORPO_NAME, check if it contains the
        PERSO_NAME authority in the correct field (say 100, 600, 700).
    
    Signed-off-by: mehdi <mehdi at inlibro.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Tested merging PERSO_NAME to PERSO_NAME and PERSO_NAME to CORPO_NAME.
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

-----------------------------------------------------------------------

Summary of changes:
 authorities/merge.pl |   19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
main Koha release repository