[koha-commits] main Koha release repository branch master updated. v3.14.00-266-gfb0e766

Fri Jan 10 16:51:53 CET 2014

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  fb0e7661048747c03304d3a71b1a9aa838c673ae (commit)
       via  15953702bce6dcba94d351655fb42c29edd5789d (commit)
       via  e4387c1de9738cf19eb4d78b620b92a03fe1b131 (commit)
       via  0ba13938fbbee5d3fd86207b1fd5c8fe3b21383e (commit)
       via  5666ed77a34d48aa10e1ad2b1f06d99c0553644f (commit)
       via  7b1d49f84b17ef779fac8ab6874bf2d34037aaba (commit)
       via  d6979f71a3f0d8ba2dc82d378ca903527f0d6ab9 (commit)
       via  732ad864f66b2cc729e6fb6bdba8611e4f40fbd9 (commit)
       via  febd0312f8623c9861bd70dd61aa3fd47afb1b51 (commit)
      from  b2ca71d9b40b97e2a0e5cee2fc2b6f69978b5b1b (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 fb0e7661048747c03304d3a71b1a9aa838c673ae
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Tue Oct 15 15:01:31 2013 +1300

    Bug 11051: remove unneccessary SQL queries in GetBranches

    The way GetBranches was written, it will issue one query to get all
    branches, and then one query per branch for the branch relations.
    This patch pre-fetches the relations table (as we need it all anyway)
    and so makes the whole process happen in two queries, rather than take
    1+N, where N is the number of branches.

    This might not seem like much, but when you do a search, GetBranches is
    called once for each result, so 25. And you might have 10 branches. This
    causes 275 database requests when you could get away with 50.

    From profiling, when you run a search, this is the thing that calls
    DBI::st::execute the most. Refer:
    http://debian.koha-community.org/~robin/opac-search/usr-share-koha-lib-C4-Branch-pm-146-line.html#125

    Test Plan:
    * Have a database with branches and relationships between the branches.
      (these are 'Library groups' in the UI.
    * Make sure the relationships show up correctly after applying the
      patch.

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 15953702bce6dcba94d351655fb42c29edd5789d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Jan 7 15:14:01 2014 +0100

    Bug 11475: fix return link after editing/deleting items in batch

    Bug introduced by bug 9044.

    Test plan:
    1- First we search for records with multiple items (books or serials,
    does not matter)
    2- We open this record we found with multiple items for editing
    3- We chose "Edit items in batch" option from the "Edit" menu
    4- We make corrections on the fields under the "Edit item"  (For example
    we change the collection code as "fiction")
    5- We save this using "Save button" at the bottom, after we are done.
    6- Just after we save, there will be a button named "Done" available
    just under the page, and when we click on "Done" we encounter the Error
    screen.

    Before the patch, the "Done" link points to
    /cgi-bin/koha/tools/CATALOGUING.
    After applying the patch, the "Done" link points to the biblio detail
    page.

    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    All tests pass

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Passes koha-qa.pl, works as advertised

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit e4387c1de9738cf19eb4d78b620b92a03fe1b131
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Tue Nov 19 16:19:12 2013 +1300

    Bug 10646 - warn if mod_rewrite is not enabled

    Koha requires mod_rewrite. If it's not enabled in Apache, then
    koha-create will now abort with a helpful error message. Also adds a
    warning when not run as root to avoid confusing errors.

    Test plan:
     * apply the patch
     * a2dismod rewrite
     * run koha-create without sudo, note the error about being root
     * run koha-create with sudo, note the error about rewrite
     * a2enmod rewrute
     * repeat test above, note that it works

    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Works as expected.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 0ba13938fbbee5d3fd86207b1fd5c8fe3b21383e
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Dec 27 16:06:34 2013 +1300

    Bug 11452: Add unit tests for Koha::Template::Plugin::Cache

    To test

    run prove t/Koha_Template_Plugin_Cache.t

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works nicely.

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 5666ed77a34d48aa10e1ad2b1f06d99c0553644f
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Wed Jan 8 12:21:42 2014 -0300

    Bug 11499: UT: Make zebra_setup.pl correctly set indexing mode

    By adding the relevant environment variables to the script the generated
    koha-conf.xml file for the unit tests is correct now.

    Test plan:
    - Verify that tests pass now:
      $ prove -v t/db_dependent/Search.t 2> /dev/null | grep 11499

    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Passes unit test, koha-qa.pl

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 7b1d49f84b17ef779fac8ab6874bf2d34037aaba
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Wed Jan 8 12:17:26 2014 -0300

    Bug 11499: (regression tests) indexing modes not properly set on generated koha-conf.xml

    t/db_dependent/Search.t creates its own temporary koha-conf.xml and
    related files, and it fails to properly set indexing modes for
    bibliographic and authority records.

    This patch adds regression tests for that.

    To test:

     $ prove -v t/db_dependent/Search.t 2> /dev/null | grep 11499

    The test should fail unless the main page is applied.

    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit d6979f71a3f0d8ba2dc82d378ca903527f0d6ab9
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Thu Jan 9 15:51:11 2014 -0300

    Bug 11439: (follow up) add missing rollback call

    This UT got wrapped inside a transaction with autocommit=0 but
    the rollback call was inadvertedly ommited. Adding it.

    [RM note: an explicit rollback is not required, as the
     transaction will roll back automatically at the end of
     the DB session. Nonetheless, it hurts nothing to have
     it be explicit.]

    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 732ad864f66b2cc729e6fb6bdba8611e4f40fbd9
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Mon Jan 6 16:53:33 2014 +0000

    Bug 11480: Fix invalid assumptions in JSONStream test

    Tests for C4::Output::JSONStream made the invalid assumption
    that the hash keys of the modules internal structure
    will always be returned in the same sequence.
    A hash is an unordered structure. as of perl 5.18
    this has beem reinforced by random seeding of the
    hashing function. See the info in perldelta and
    the doc for JSON.

    This patch changes the tests to be sequence-neutral
    where the previous test was testing that a new element
    was added and an existing one was untouched these have
    been separated into individual tests.

    Some typos in the messages have been corrected

    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

    Test Plan

    1/ Run t/Output_JSONStream.t , 8 tests should pass (or perhaps fail,
       but inconsistently under perl 5.18 or greater)
    2/ Apply patch
    3/ Run t/Output_JSONStream.t 10 tests should pass now

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit febd0312f8623c9861bd70dd61aa3fd47afb1b51
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Dec 27 19:06:34 2013 +1300

    Bug 7965: Silence warns in staff log

    Silence warns in C4::Bookseller::GetBooksellersWithLateOrders()

    to test
    1/ run prove t/db_dependent/Bookseller.t
       Notice lots of Use of uninitialized value $delay in numeric lt (<) at /var/lib/jenkins/jobs/Koha_master/workspace/C4/Bookseller.pm line 134 type lines
    2/ apply patch
    3/ run prove t/db_dependent/Bookseller.t
       Notice warns are gone

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Tiny change, positive consequences.
    Passes QA script and all tests.

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 C4/Bookseller.pm                                   |    2 +-
 C4/Branch.pm                                       |   43 ++++++++------------
 debian/scripts/koha-create                         |   20 +++++++++
 .../prog/en/modules/tools/batchMod-del.tt          |    9 +++-
 .../prog/en/modules/tools/batchMod-edit.tt         |    7 +++-
 t/Koha_Template_Plugin_Cache.t                     |    6 +++
 t/Output_JSONStream.t                              |   10 +++--
 t/db_dependent/Search.t                            |    7 +++-
 t/db_dependent/XISBN.t                             |    2 +
 t/db_dependent/zebra_config.pl                     |    3 ++
 10 files changed, 75 insertions(+), 34 deletions(-)
 create mode 100644 t/Koha_Template_Plugin_Cache.t

hooks/post-receive
-- 
main Koha release repository