[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.05.1-44-gb885421

Fri Apr 3 05:45:30 CEST 2015

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, 3.18.x has been updated
       via  b8854217167cda10a9bfb1e9384d62c73f7f6c18 (commit)
       via  87a294010e0916117ef51dde0930900bf75e1eb7 (commit)
       via  6dbb2ccb95313483b730cec991004b91ece5c1e9 (commit)
       via  1c79abac918a1391fecc90a4adda8c0ebb8a3ed0 (commit)
       via  7d6fe812e48a9cb941f827ae1e1794e4d0ea4dd1 (commit)
       via  09c9f8549bbd10a95a99dc1ae3f6e9fd7930231f (commit)
       via  ed4dcb8d0cb087e5ec613a60c13e407c315ba968 (commit)
      from  e66865142ed66c3d74b985ee75fac0dad8f9fc21 (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 b8854217167cda10a9bfb1e9384d62c73f7f6c18
Author: Thomas <tomsStudy at gmail.com>
Date:   Fri Jan 23 12:19:48 2015 +0000

    Bug 13531 - Follow up

    Add logging of errors.

    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    More errors are indeed showing up in the log.
    (I took the liberty of changing the commit message a little bit.)

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 482f2f31a8d4b13ee5bbc3fb211048056e11f090)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 87a294010e0916117ef51dde0930900bf75e1eb7
Author: Thomas <tomsStudy at gmail.com>
Date:   Wed Jan 14 20:20:36 2015 +0000

    Bug 13531: QA follow up

    A minor QA comment.

    ::: misc/migration_tools/bulkmarcimport.pl
    @@ +271,5 @@
    >          my ( $error, $results, $totalhits ) = C4::Search::SimpleSearch( $query, 0, 3, [$server] );
    > +        # changed to warn so able to continue with one broken record
    > +        if ( defined $error ) {
    > +            warn "unable to search the database for duplicates : $error";
    > +            next;

    For consistency with the rest of the script, should this perhaps be:

    next RECORD;

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 002b79c200f03adc162a5f59b988e8eb6c65e229)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 6dbb2ccb95313483b730cec991004b91ece5c1e9
Author: Thomas <tomsStudy at gmail.com>
Date:   Tue Jan 13 03:28:41 2015 +0000

    Bug 13531 - bulkmarcimport bombs if no match is found Changed the die statment to a warn allowing the import to continue.

    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit e1cdb4ebfa9e00850566a01de2719ff8daa9aee0)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 1c79abac918a1391fecc90a4adda8c0ebb8a3ed0
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Feb 25 10:44:00 2015 +0100

    Bug 13740: Fix null vs not null in the query

    The previous patch did not work, only patrons *with* guanrantees were
    deleted!

    Signed-off-by: Koha Team AMU <koha.aixmarseille at gmail.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 316485b1c4bb1cfa4c0de19e857e692d34351234)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 7d6fe812e48a9cb941f827ae1e1794e4d0ea4dd1
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Feb 20 16:23:50 2015 +0100

    Bug 13740: Remove the NOT NULL clause in GetBorrowersToExpunge

    C4::Borrowers::GetBorrowersToExpunge should not use a "NOT IN", it is
    not efficient at all.

    With only 1 guarantor and more than 136k patrons, the not in clause in
    this subroutine takes ages:
    mysql> select count(*) FROM   borrowers where  borrowernumber NOT IN
    (SELECT guarantorid FROM borrowers WHERE guarantorid IS NOT NULL AND
    guarantorid <> 0) ;
    [...]

    not ended after 5min

    With the query modified by this patch, the results come after 1 sec :)

    Test plan:
    Verify the delete_patrons.pl cronjob or the cleanborrowers tools work as
    before.
    Especially with guarantors.

    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>

    Signed-off-by: Koha Team AMU <koha.aixmarseille at gmail.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit b721b6f9f3b8eb65a929ca0605216b58f8f87996)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 09c9f8549bbd10a95a99dc1ae3f6e9fd7930231f
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Thu Mar 5 13:27:08 2015 +0100

    Bug 12291:_(followup) Replace the acronym HTML tag with abbr

    This patch replaces the last occurrence of <acronym> with <abbr>.

    To test:
    - Apply this patch on top of the first patch and check that
      "grep -r "<acronym" koha-tmpl/*/*/en/*" does not return any hits.

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit eb2d7db6555abf1a52f8ce96c0370ec09c32bca8)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit ed4dcb8d0cb087e5ec613a60c13e407c315ba968
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Feb 20 11:42:31 2015 +0100

    Bug 12291: Replace acronym with tag at the OPAC

    On the OPAC authentification page, the acronym tag is used, but
    deprecated.
    It should be replaced with abbr:
    http://www.w3.org/wiki/HTML/Elements/acronym

    Test plan:
    Enable the CAS authentification and verify the tags have correctly been
    replaced.

    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Befor the patch, "grep -r "<acronym" koha-tmpl/*/*/en/*" shows 4 occurences of
    <acronym>, 3 related to CAS. After the patch, the same grep shows 1 remaining
    <acronym>, in acqui/parcels.tt. I sign off this patch and will provide a
    followup for the last occurrence.

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit fae32e22ef6fc4f9b02d4fb804e722b9db09cf09)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 C4/Members.pm                                            |   13 ++++++++++---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt    |    6 +++---
 misc/migration_tools/bulkmarcimport.pl                   |    7 ++++++-
 4 files changed, 20 insertions(+), 8 deletions(-)

hooks/post-receive
-- 
main Koha release repository