[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.11-1-15-g293d05d

Sun Sep 10 11:06:43 CEST 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, 16.11.x has been updated
       via  293d05d0af9817e7d0b31bbb19684494f259714a (commit)
       via  fe0e8e740a044ca2002091aaacbe0843749fe56d (commit)
       via  396ff22074d681d055539fa8928476fe4228a7be (commit)
       via  96d5d2995cd56ee41b9f26e621f6903d823323d5 (commit)
       via  9f06cd63b54d39510b230227bca52530d25fc221 (commit)
       via  8ef1bf53cfa0c7ee74bd157c39adc68b5e1121c7 (commit)
       via  4e59f94961cd39d079bcd3664a8e5f7fa479c156 (commit)
       via  35bbde509361ebccbf5205083b17ed650d41eeb1 (commit)
       via  98631a3e7617416acbcfdff51451367789307556 (commit)
       via  333ff8c73d90e59f14e4ee95b3c414f36837c249 (commit)
       via  61d79bc04b2beecf708a352933b6a69dab414be0 (commit)
       via  00fa408221776634ecd1066b9e67349ff2d535dd (commit)
       via  82a8f296827edf58319213640979075b60b79fe3 (commit)
       via  4fa59dbd8e7cabf92fb7d470d4ec385480f0184a (commit)
       via  9cefbaf964772848cc338a910d55c558bf579d1a (commit)
      from  b06a26fa83f6af37ee098ac0101deff786beca6e (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 293d05d0af9817e7d0b31bbb19684494f259714a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Aug 22 16:41:46 2017 +0200

    Bug 19163: Critical typo in stage-marc-import process

    Template says ISO2709 but script wants MARC or MARCXML..
    Slipped in with bug 19049.
    Trivial but critical fix.

    Test plan:
    Import a MARC file.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    I picked this fix because I think MARC is always ambiguous. ISO2709
    clearly denotes the serialization format used.

    Signed-off-by: Liz Rea <liz at catalyst.net.nz>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit fe0e8e740a044ca2002091aaacbe0843749fe56d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Aug 11 08:34:45 2017 +0200

    Bug 19049: [QA Follow-up] Mock config, default format

    As requested by QA:
    [1] Mock_config enable_plugins in the test.
    [2] Fallback to MARC when format is empty. Remove die statement.
    Added:
    [3] Remove $marc. This variable got obsolete during development.
    [4] Add test on $input_file and $plugin_class. Test $text before calling
        Handler or processing $text. No need to split undef if somehow Handler
        returned undef, etc. If the routine returns an empty arrayref,
        stage-marc-import will do fine.

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit a423fcff42da05e9ebf9f2b4a2f192023346e93e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit f067450d8011fb0a27a28524bec359ffad4f2278)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 396ff22074d681d055539fa8928476fe4228a7be
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Aug 10 09:02:37 2017 -0400

    Bug 19049 [QA Followup] - Make plugin name first item in description

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d8f6315b6d9b1c7145f6036b55b7927f6d6e6e48)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 5699df9deed09edbaa3db1087f3e453c28ac1091)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 96d5d2995cd56ee41b9f26e621f6903d823323d5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 10 13:02:23 2017 +0200

    Bug 19049: [Follow-up] Make sure that GetPlugins finds the plugin

    We have to mock_config the pluginsdir before Plugins is loaded, and
    we should pass an absolute path (not a relative one).
    If you did not install the test to_marc plugin, this test would fail.

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Verified patch is compatible with original KitchenSink to_marc plugin

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0987b135ea0bb8fbd4fc39643b19715dc6e3a1c8)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 3bbb89c57181c113d64ec7649195de30b52d0806)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 9f06cd63b54d39510b230227bca52530d25fc221
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Aug 8 14:51:41 2017 +0200

    Bug 19049: Testing RecordsFromMarcPlugin with a to_marc plugin

    This patch adds a simple to_marc plugin in t/Koha/Plugin that is used
    in the added subtest in ImportBatch.t.

    Test plan:
    [1] Run t/db_dependent/ImportBatch.t
    [2] Copy the to_marc test plugin from t to your plugin directory.
        Under Debian packages, you should do something like:
        mkdir -p /var/lib/koha/master/plugins/Koha/Plugin/
        cp [yourclone]/t/Koha/Plugin/MarcFieldValues.pm /var/lib/koha/master/plugins/Koha/Plugin/
    [3] Check if you see this plugin on plugins/plugins-home.pl
    [4] Create a text file with some fields like:
        (Note: The plugin needs an empty line between both "records".)
        100,a = Test Author 1
        245,a = Title One

        100,a = Author 2
        245,a = Title Two
    [5] Go to stage-marc-import.pl. Upload the created file. Select the plugin
        in the format combo and proceed. Did you create two records ?

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 83f60adbab8e96f0f14ec547029582623ac3a068)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit c6e3f2ac0575849a0b48170506a4986a50ac8bf1)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 8ef1bf53cfa0c7ee74bd157c39adc68b5e1121c7
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Aug 7 21:24:48 2017 +0200

    Bug 19049: Fix regression on stage-marc-import with to_marc plugin

    Bug 12412 added the use of to_marc plugins allowing arbitrary file formats
    in stage-marc-import (as long as the plugins can handle them). The feature
    was not very visible in the code, and when bug 10407 added the marcxml
    format, it made some changes that broke the use of to_marc.

    This patch restores the functionality by:
    [1] Adding a sub RecordsFromMarcPlugin to ImportBatch.pm, specifically
        addressing the conversion from arbitrary formats to MARC::Record.
        The original to_marc interface is used: pass it the file contents,
        and it returns a string consisting of a number of MARC blobs separated
        by \x1D.
        Consequently, the call of to_marc is removed from routine
        BatchStageMarcRecords where it did not belong. The to_marc_plugin
        parameter is removed and two calls are adjusted accordingly.
    [2] Instead of a separate combo with plugins, the format combo contains
        MARC, MARCXML and optionally some plugin formats.
    [3] The code in stage-marc-import.pl now clearly shows the three main
        format types: MARC, MARCXML or plugin based.

    Note: This patch restores more or less the situation after bug 12412, but
    I would actually recommend to have the to_marc plugins return MARC::Record
    objects instead of large text strings. In the second example I added a
    to_marc plugin that actually converts MARC record objects to string format,
    while RecordsFromMarcPlugin reconverts them to MARC::Records.

    Test plan:
    See second patch.

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit d24568b67256fab79b42ead54302c76d1c9653d7)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 4dd020a3019cd7e2b357153ec737b15eea95f671)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 4e59f94961cd39d079bcd3664a8e5f7fa479c156
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 7 13:50:32 2017 -0300

    Bug 19053: Keep auto_renew flag if a confirmation is needed

    If an item is checked out with the auto renewal flag and a confirmation
    is needed (holds exist, past due date, etc.) the auto renewal flag will
    get lost.

    Test plan:
    - Check an item out and specify a past due date
    - Confirm the checkout on the confirmation screen
    => Without this patch the checkout is not marked as auto renewal
    => With this patch applied the auto renewal flag will be set to the
    checkout

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 3808dbc1d22b3adc43a09ba7ce00aaca01f95f5a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 8f3a7d800271cb2611de0cb369e907b16c30fb0b)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 35bbde509361ebccbf5205083b17ed650d41eeb1
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Aug 7 16:07:40 2017 -0300

    Bug 18624: Minor refactoring to ease testing

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit ff41b87302c1b242f9edd7b2e8c253bd18b57ac1)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 4c50a19ab920b488193d78ee18d89bb143ddae4a)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 98631a3e7617416acbcfdff51451367789307556
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 7 17:55:50 2017 +0000

    Bug 16976 - Unit tests

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 07c0d968b70421852ac4915633fa7f3cbd0d18cd)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit a0bc776e67569b83dc3d5bc47069ceb1408badb2)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 333ff8c73d90e59f14e4ee95b3c414f36837c249
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jun 16 06:36:22 2017 -0400

    Bug 16976 - Authorities searches with double quotes gives ZOOM error 20003 [Alternate]

    I dug into this a little bit, it seems the issue is that we were double
    processing the query because of an extra call to
    C4::AuthoritiesMarc::SearchAuthorities

    I think we can simply remove this call

    To test:
    1 - Perform an authority search for a value that returns results
    2 - Wrap it in quotes and search
    3 - 'Internal server error'
    4 - Apply patch
    5 - Search with quotes succeeds

    https://bugs.koha-community.org/show_bug.cgi?id=16796

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 9c8a04acb05466356fec8e9d6d13183295719c7d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 39a2f6421e3d0b2c415ad9abc655193357e24328)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 61d79bc04b2beecf708a352933b6a69dab414be0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 14 10:26:48 2017 -0300

    Bug 18331: POST_CHOMP everywhere!

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 3c6168d37436b7312e130f796d47271ff2de77cf)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 4c86b575b2ef09cceefa9a2718053e45a71c2b25)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 00fa408221776634ecd1066b9e67349ff2d535dd
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Tue Aug 8 08:23:57 2017 +0000

    Bug 18331: Followup - fix path to orders_by_budget csv header

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 14484ba4234fd1cbb925b5f3a4844da863c65d5a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit c6a3c7c39babf64ad916650277ab752e54072916)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 82a8f296827edf58319213640979075b60b79fe3
Author: Lee Jamison <ldjamison at marywood.edu>
Date:   Fri Aug 4 19:27:22 2017 +0000

    Bug 18331: Followup - Fix CSV export (once and for all!)

    Follow-up on Comment 21 to correct the empty_line.inc
    include in basket.tt

    https://bugs.koha-community.org/show_bug.cgi?id=18331

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2ee4e0ac381ed23fa23b1117725b2f6a0e0db4de)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit ad4c173bca27de2b05a1c47a3977212f72654c40)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 4fa59dbd8e7cabf92fb7d470d4ec385480f0184a
Author: Marc Véron <veron at veron.ch>
Date:   Thu Aug 3 17:50:30 2017 +0200

    Bug 18331: Force tt to insert newline to empty_line.inc

    See end of comment #4 and IRC:
    http://irc.koha-community.org/koha/2017-08-03#i_1958062

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit a10e5383016a5cb4117719ac858cbe02a53e457b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit c4e608d29954195f01ea170ff06d7e8da4814707)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 9cefbaf964772848cc338a910d55c558bf579d1a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jun 12 17:04:47 2017 -0300

    Bug 18331: Fix CSV export (once and for all!)

    I am going to try and explain the problem here in order to make it a
    have-to-read for next changes.

    There are several things to test when and most of the time we break
    something when we try to fix something else.

    You have to test different CSV export, not only one. There are not all
    processed the same way. For instance acqui/csv/basket.tt does not
    contain any strings to translate and the translate script will copy the
    original file as it.
    But reports/csv/orders_by_budget.tt will not! Indeed it contains "TOTAL"
    which will be translated. The generated tt file for the translated
    language will remove all the carriage returns! That's why we cannot rely
    on TT for newlines (contrary to bug 16914 assumption).

    There are two possible methods:
    1/ Fix the translate script
    => Hum... nope
    2/ Remove all carriage returns and make them explicit by including an
    file that only contains 1 carriage return

    This second method is implemented in this patch.

    How it works: Use the PRE_CHOMP "[%-" and POST_CHOMP "-%]"
    (http://www.template-toolkit.org/docs/manual/Config.html#section_PRE_CHOMP_POST_CHOMP)
    to remove all the newlines that could be added by TT in the original
    (en) files. Then include the new_line.inc to add a new line.
    That way original and translated files will behave the same way.
    The BLOCK in the csv_headers avoid to have the newlines added, in any
    cases. For instance: by default we will have an empty line at the end of
    the headers, but the translated headers will not have it.

    Test plan:
    At least 2 signoffs will be needed, please test carefully!
    You will need to generate CSV with at least 2 entries!
    Test with the non-translated interface (en) and with the language you
    want. To test with a translated language you will *have to*:
    - cd misc/translator
    - perl translate update LANG
    - manually edit the po file, remove the fuzzy tags, correctly translate
    the string (do not forget the additional %s in the headers)
    - perl translate install LANG
    1/ Export basket and basketgroup as CSV
    2/ Export late orders as CSV
    3/ Export items (from the item search) as CSV
    4/ Export the 2 reports "Orders by fund" and "Cash register" as CSV

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>

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

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 8403799c7212349bee70090249e3425afd62423b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 5b1c9cd3f27d377ddee5635f32fd1a3e2626409c)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

Summary of changes:
 C4/ImportBatch.pm                                  |   53 +++++++++---
 Koha/SearchEngine/Elasticsearch/QueryBuilder.pm    |   27 +++---
 Koha/SearchEngine/Zebra/QueryBuilder.pm            |    1 -
 circ/circulation.pl                                |    1 +
 .../prog/en/includes/csv_headers/acqui/basket.tt   |    2 +-
 .../en/includes/csv_headers/acqui/basketgroup.tt   |    2 +-
 .../en/includes/csv_headers/acqui/lateorders.tt    |    2 +-
 .../includes/csv_headers/catalogue/itemsearch.tt   |    2 +-
 .../csv_headers/reports/cash_register_stats.tt     |    2 +-
 .../csv_headers/reports/orders_by_budget.tt        |    2 +-
 .../intranet-tmpl/prog/en/includes/empty_line.inc  |    1 +
 .../prog/en/modules/acqui/csv/basket.tt            |    9 +-
 .../prog/en/modules/acqui/csv/basketgroup.tt       |   10 ++-
 .../prog/en/modules/acqui/csv/lateorders.tt        |   10 ++-
 .../prog/en/modules/catalogue/itemsearch_csv.tt    |    8 +-
 .../prog/en/modules/circ/circulation.tt            |    1 +
 .../en/modules/reports/csv/cash_register_stats.tt  |   16 ++--
 .../en/modules/reports/csv/orders_by_budget.tt     |   14 ++--
 .../prog/en/modules/tools/stage-marc-import.tt     |   20 +----
 misc/stage_file.pl                                 |    2 +-
 t/Koha/Plugin/MarcFieldValues.pm                   |   86 ++++++++++++++++++++
 t/Search/Zebra/QueryBuilder.t                      |   38 +++++++++
 t/db_dependent/ImportBatch.t                       |   43 +++++++++-
 tools/stage-marc-import.pl                         |    8 +-
 24 files changed, 279 insertions(+), 81 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/empty_line.inc
 create mode 100644 t/Koha/Plugin/MarcFieldValues.pm
 create mode 100644 t/Search/Zebra/QueryBuilder.t

hooks/post-receive
-- 
main Koha release repository