[koha-commits] main Koha release repository branch master updated. v16.05.00-615-gd0f850b

Fri Sep 2 18:59:39 CEST 2016

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  d0f850b51a28afa6ae5ca41a54f43feea972c8d3 (commit)
       via  8513c24c33876a5dfcecf5950dfd74fb0dd63b67 (commit)
       via  3badc57c9339e37e5d6ec660ff0b323614ab045d (commit)
       via  3e541866cdd00389dc3f28a401911ebd4f5699e9 (commit)
       via  aa5bf4d3cc0e4d57b958e665ad1c6efa8a76a9fb (commit)
      from  11315ef090948b22d0cb424e4119011eff8f5036 (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 d0f850b51a28afa6ae5ca41a54f43feea972c8d3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Jul 12 14:40:35 2016 +0200

    Bug 10407: [QA Follow-up] Hashref process_batch params

    As requested by Mark Tompsett. Hope this guarantees a signoff now..

    Note: For consistency four additional parameters were needed to no longer
    use file level vars in this subroutine.

    Test plan:
    Import a file with stage_file.pl.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Imported a marc file and a marcxml file with stage_file.pl.

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

commit 8513c24c33876a5dfcecf5950dfd74fb0dd63b67
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 8 13:17:36 2016 +0200

    Bug 10407: Add two subtests to t/ImportBatch.t

    Creates a few simple tests for the two new subroutines in ImportBatch.pm.

    Test plan:
    Run t/ImportBatch.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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

commit 3badc57c9339e37e5d6ec660ff0b323614ab045d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Jul 7 14:13:16 2016 +0200

    Bug 10407: Add marcxml import (follow-up)

    This patch makes the following changes:

    [1] Based on the groundwork of the former patch, add call to
        RecordsFromMARCXMLFile in stage-marc-import. Use format param.
    [2] Add format to the template. Use file extension to determine.
        If you use .xml or .marcxml as extension, MARCXML is selected.
    [3] In stage-marc-import.tt mark UTF-8 encoding as UTF-8 not as utf8.
    [4] BatchStageMarcRecords: do not call plugin if you have no records.
    [5] RecordsFromISO2709File: also return errors in an array.
    [6] In misc/stage_file.pl also use UTF-8. Handling of errors from [5].

    Test plan:
    [1] Import an empty file as MARC or MARCXML (with Tools/Stage..import).
    [2] Import an non-empty file with invalid contents as MARC or MARCXML.
    [3] Export a few records with Tools/Export as MARC and MARCXML.
    [4] Import these two files. Check selected format versus file extension.
    [5] Import a MARCXML file with misc/stage_file.pl.

    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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

commit 3e541866cdd00389dc3f28a401911ebd4f5699e9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 8 08:34:00 2016 +0200

    Bug 10407: Resolve warnings from child process

    After the staging job finishes, the child tries to print results to
    STDOUT (which is closed). This creates warnings like:

    stage-marc-import.pl: binmode() on closed filehandle STDOUT at C4/Templates.pm line 120.
    stage-marc-import.pl: Filehandle STDOUT reopened as FH only for input at /usr/lib/perl5/Template/Provider.pm line 964.

    Resolving it is simple: the child should exit after marking the job
    as finished.

    Test plan:
    Import a marc file.
    Observe that you do no longer have such warnings.

    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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

commit aa5bf4d3cc0e4d57b958e665ad1c6efa8a76a9fb
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date:   Fri Apr 17 20:12:49 2015 +0300

    Bug 10407: Allow MARCXML records to be imported via GUI (groundwork)

    Patch from Olli, manual rebase by Marcel (July 7, 2016).

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Needs follow-up. Test plan in the third patch.

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

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

Summary of changes:
 C4/ImportBatch.pm                                  |   80 ++++++++++++++++---
 .../prog/en/modules/tools/stage-marc-import.tt     |   13 +++-
 misc/stage_file.pl                                 |   81 ++++++++++++--------
 t/ImportBatch.t                                    |   80 ++++++++++++++++++-
 tools/stage-marc-import.pl                         |   30 ++++----
 5 files changed, 221 insertions(+), 63 deletions(-)

hooks/post-receive
-- 
main Koha release repository