[koha-commits] main Koha release repository branch master updated. v16.11.00-300-g6ddd4b2

Fri Jan 20 15:00:08 CET 2017

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  6ddd4b2f5f57c5cf30b240faaf4380b4256df783 (commit)
       via  8fcf2d6e50091e542a87d62289c1dbb5f52da8b5 (commit)
       via  dd1c63230f7327bea6151962e92474acee38ab01 (commit)
       via  28b74224d34ca33415766155cec747d599195a6c (commit)
       via  ede08d725e56cd34bd2f1aa4ca87fa837cc01580 (commit)
       via  681ae8430e60fd0c97ea0652b02ee3daf849ed5d (commit)
       via  8cde85451e3bae584ed1838efcaa4085cb656dfe (commit)
       via  9290e10abee67fea6619ae6a1564fc96777274b4 (commit)
       via  79c81920abe7f6821d49834e71a5c1649f2f615e (commit)
       via  ffe1f6555ca420a3bf46cb42f180761f13f715f8 (commit)
       via  f9a4204ce36f1cf268ab45c6fcc89c51bd4c0d37 (commit)
      from  e3a12e517a9039fa93b8b57e0adedbad5f0e9153 (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 6ddd4b2f5f57c5cf30b240faaf4380b4256df783
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jan 20 13:51:29 2017 +0100

    Bug 17913: [Follow-up] Fix duplicate $9s after merging in loose mode

    We need to add $9 to the skip_subfields hash too. Formerly, it was
    added to $exclude as well.
    Thanks, Julian, for catching this one.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 8fcf2d6e50091e542a87d62289c1dbb5f52da8b5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jan 20 12:54:56 2017 +0100

    Bug 17913: [Follow-up] Another small fix for UNIMARC

    Adding another delete for field 100.
    Will mock GetMarcBiblio on a new report.

    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit dd1c63230f7327bea6151962e92474acee38ab01
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Jan 17 11:59:53 2017 +0100

    Bug 17913: Run perltidy on the inner foreach loop

    Kept the same number of lines.
    You could verify with diff -w.

    Test plan:
    [1] Run t/db_dependent/Authorities/Merge.t
    [2] As the last patch in this series, also test the interface:
        Set AuthorityMergeMode to loose. Set dontmerge to Do.
        Modify an authority record attached to multiple biblios.
        Edit a subfield, clear a subfield and add a subfield.
        Save. Wait a bit for the merge and Zebra update.
        Verify that the changes are merged properly into biblio records.
    [3] Repeat step 2 with AuthorityMergeMode to strict.
        Remember that this affects the extra subfields in biblio records.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 28b74224d34ca33415766155cec747d599195a6c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Jan 17 11:37:55 2017 +0100

    Bug 17913: We always need some housekeeping

    Remove some commented warnings
    Remove the commented old code at the end of sub merge
    Explicitly set merge mode in the first subtest
    Move the return to loose mode from the second subtest to the third

    Test plan:
    Run t/db_dependent/Authorities/Merge.t

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit ede08d725e56cd34bd2f1aa4ca87fa837cc01580
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Jan 17 10:09:40 2017 +0100

    Bug 17913: Remove possible duplicates in strict merge mode

    Since strict mode does not allow additional subfields that would make
    identical fields linked to the same authority different, there is no
    need to keep them while merging.

    We achieve this goal by simply:
    [1] Count the number of same fields linked to mergefrom in strict mode to
        eliminate duplicates.
    [2] Replaces the if-statement on auth_number by a next. (Tidy follows.)

    Test plan:
    Run t/db_dependent/Authorities/Merge.t

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 681ae8430e60fd0c97ea0652b02ee3daf849ed5d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Jan 17 09:32:44 2017 +0100

    Bug 17913: Do not keep a cleared subfield in loose merge mode

    If you modify an authority and clear a specific subfield, you expect that
    merge respects your edit and clears this subfield too in the biblio
    records. It does in the new strict mode, but it does not yet in the
    default loose mode.

    This patch fixes that by adjusting the code around $exclude so that it
    uses a new hash skip_subfields, built from the reporting tags from the old
    and the new authority record.

    This is supported again by some changes in the unit test.

    Test plan:
    Run t/db_dependent/Authorities/Merge.t

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 8cde85451e3bae584ed1838efcaa4085cb656dfe
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jan 16 14:54:37 2017 +0100

    Bug 17913: Fix the new field tag in merge when changing type

    Originally aimed for 9988, adjusted for this report.

    Old behavior was: pick the first tag. This is definitely wrong.
    If you (would) merge 610 to 611, you don't want to get a 111.

    This patch resolves the problem by determining the new tag in a small
    helper routine _merge_newtag, and corrects the position of the new field
    in the MARC record with append_fields_ordered. Too bad that MARC::Record
    does not have such a function; it looks like insert_fields_ordered, but
    it is different in case of multiple fields with the same tag.

    Note: These two small helper functions are not tested separately, since they
    should not be called outside of merge. They are implicitly tested by the
    adjusted tests in Merge.t.

    Note: In adding tests for this fix, I chose to simplify compare_field_count
    (no need for the pass parameter), and replace the pass parameter of sub
    compare_field_order by an exclude parameter, a hash of fields to exclude in
    counting fields.

    Test plan:
    Run t/db_dependent/Authorities/Merge.t

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 9290e10abee67fea6619ae6a1564fc96777274b4
Author: mbeaulieu <mbeaulieu at inlibro.com>
Date:   Mon Aug 18 10:04:55 2014 -0400

    Bug 17913: Adjust merge test for AuthorityMergeMode

    Original fix from a patch on bug 11315.
    Amended by Marcel de Rooy January 2017.

    Test plan:
    Run t/db_dependent/Authorities/Merge.t in both loose and strict mode.
    Should no longer make a difference.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 79c81920abe7f6821d49834e71a5c1649f2f615e
Author: Frédérick <frederick.capovilla at libeo.com>
Date:   Wed Nov 27 12:30:55 2013 -0500

    Bug 17913: Use AuthorityMergeMode pref in sub merge

    Original fix from a patch on bug 11315.
    Amended by Marcel de Rooy January 2017.

    Test plan:
    If you set mode to loose, the test will still pass.
    If you set mode to strict, one test will fail. (Fixed later.)

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit ffe1f6555ca420a3bf46cb42f180761f13f715f8
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Mon Jan 3 16:32:21 2011 +0200

    Bug 17913: Use replace_with instead of insert_grouped_field

    Original fix from a patch on bug 5572.
    Amended by Marcel de Rooy January 2017.

    Note: This does not yet resolve the field order when merging to another
    auth type, but is a good start.

    Test plan:
    Run t/db_dependent/Authorities/Merge.t

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit f9a4204ce36f1cf268ab45c6fcc89c51bd4c0d37
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Mon Jan 3 16:32:21 2011 +0200

    Bug 17913: Add AuthorityMergeMode preference

    Original patch from bug 5572, dating back to 2011!
    Amended by Marcel de Rooy January 2017. Renamed the pref.

    The fix on this report is based on this preference.
    Depending on the pref, subfields will be deleted or kept.

    Test plan:
    Run the dbrev.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 C4/AuthoritiesMarc.pm                              |  171 ++++++++++----------
 installer/data/mysql/atomicupdate/bug_17913.perl   |    7 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 .../en/modules/admin/preferences/authorities.pref  |    9 ++
 t/db_dependent/Authorities/Merge.t                 |  107 +++++++-----
 5 files changed, 171 insertions(+), 124 deletions(-)
 create mode 100644 installer/data/mysql/atomicupdate/bug_17913.perl

hooks/post-receive
-- 
main Koha release repository