[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-864-gfaa4303

[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  faa43031e66d1544aa2c93befa3f849ba93806d7 (commit)
       via  4712fc66f0601fe82e27f4a06dd75f0bd345c1ef (commit)
       via  56ea0f7e0fc91d46e98f94ff9f3f87eb12b82c8b (commit)
       via  50fb4612ed573dd180c5e98e7d6e83c4265817f0 (commit)
      from  7f075448b8e00596ece780cca654471eebf949a3 (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 faa43031e66d1544aa2c93befa3f849ba93806d7
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Jul 23 23:03:31 2013 +0000

    Bug 9755: (follow-up) tweak test for tag visibility in merge hash
    
    Koha's MARC framework structure doesn't assign tags to tabs in
    the cataloging editor; only subfields are assigned to tabs, and
    the field as a whole follows the subfields.
    
    Consequently, for the purpoase of calculating a merge hash, a field
    should be added either if no MARC framework information is passed
    (which signals that the caller wants to deal with the entire MARC
    record) or if any of its subfields are assigned to visible tabs.
    
    This patch has the effect of getting rid of the following spurious
    warnings from the Apache log:
    
    merge.pl: Argument "" isn't numeric in numeric ge (>=) at /home/gmc/koha/Koha/Util/MARC.pm line 78
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 4712fc66f0601fe82e27f4a06dd75f0bd345c1ef
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Sun Jun 16 07:54:04 2013 -0400

    Bug 9755 QA follow-up: fix template compliance
    
    Fix the following test failure:
    * koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc                FAIL
        forbidden patterns          OK
        tt_valid                    FAIL
                lines 10, 24
        valid_template              OK
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script.
    Found a pre-existing problem with non-repeating subfields
    that I noted on the bug report.
    All other tests were ok and merging records worked nicely.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 56ea0f7e0fc91d46e98f94ff9f3f87eb12b82c8b
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Thu May 30 06:23:43 2013 -0400

    Bug 9755 QA follow-up: move MARC-specific functionality to utility class
    
    This follow-up moves all the MARC-specific functionality of Koha::Record
    (now renamed to Koha::MetadataRecord) to a Koha::Util::MARC utility class.
    
    To test, run relevant unit tests:
    > prove t/Koha_MetadataRecord.t t/Koha_Util_MARC.t t/db_dependent/Koha_Authority.t
    and optionally try to merge a record.
    
    Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 50fb4612ed573dd180c5e98e7d6e83c4265817f0
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Wed Mar 6 11:30:40 2013 -0500

    Bug 9755: Refactor record merge functionality
    
    This patch refactors the merge record interface and code a little bit
    in preparation for making it possible to merge authority records.
    
    To test:
    1) Apply patch.
    2) Try merging two records:
        a) Create a list.
        b) Add two records you would like to (or be willing to) merge
           to said list.
        c) View said list.
        d) Check the checkboxes next to the two records you added.
        e) Click "Merge selected records."
        f) Choose a merge reference.
        g) Choose fields from each record that you want to keep.
        h) Click "Merge."
    3) Confirm that your merged record has the fields and subfields you
       wanted.
    4) Run the unit tests for the two files that were changed:
        prove t/Koha_Record.t t/db_dependent/Koha_Authority.t
    5) Sign off.
    
    Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 Koha/Authority.pm                                  |   12 +-
 Koha/{Linktracker.pm => MetadataRecord.pm}         |   54 ++---
 Koha/Util/MARC.pm                                  |  109 ++++++++
 cataloguing/merge.pl                               |   74 +-----
 .../prog/en/includes/merge-record.inc              |  227 +++++++++++++++++
 .../prog/en/modules/cataloguing/merge.tt           |  264 +-------------------
 t/Koha_MetadataRecord.t                            |   98 ++++++++
 t/Koha_Util_MARC.t                                 |   97 +++++++
 8 files changed, 575 insertions(+), 360 deletions(-)
 copy Koha/{Linktracker.pm => MetadataRecord.pm} (50%)
 create mode 100644 Koha/Util/MARC.pm
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc
 create mode 100755 t/Koha_MetadataRecord.t
 create mode 100755 t/Koha_Util_MARC.t


hooks/post-receive
-- 
main Koha release repository