[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.14-35-g1711127e12

Git repo owner gitmaster at git.koha-community.org
Sun Sep 20 17:27:23 CEST 2020


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, 19.05.x has been updated
       via  1711127e1268b39f3253955f8bde22a253f93f79 (commit)
       via  8cc6f98cc23d534724da4e909ded96a7c69f43f2 (commit)
       via  82e36e20bbdd5469f75a45a1e622c3556ee09a4c (commit)
      from  ad077543b17fac7f2410a60aeeaf8aa595697a08 (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 1711127e1268b39f3253955f8bde22a253f93f79
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Fri Jul 17 11:31:29 2020 +0000

    Bug 26000: Make exception_holidays cache with branch in key
    
    In light of 25723 offering a simpler solution here.
    This would just let us avoid backporting larger changes, but this can be
    marked as a duplicate if 25723 is preferred to this change
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
    
    (cherry picked from commit 1d9737486c8aad3a419d1b4ad22ba1a43ee243d3)
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>

commit 8cc6f98cc23d534724da4e909ded96a7c69f43f2
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Jul 16 19:30:28 2020 +0000

    Bug 26000: Unit test
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
    
    (cherry picked from commit 45f3645aebb6d96efaece4af140cf6734b0c0bbb)
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>

commit 82e36e20bbdd5469f75a45a1e622c3556ee09a4c
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Mon Jun 29 15:07:10 2020 +0200

    Bug 23542: Fix SRU import encoding
    
    When importing records from a SRU server, the diacritics have bad encoding.
    I reproduce with BNF server so it may be a UNIMARC issue.
    
    Tests show that difference between Z39.50 server and SRU is that leader contains 'a' at postion 9.
    Looking at MARC::Record->encoding() shows that encoding depends on leader even for UNIMARC.
    So this patch adds a call to MARC::Record->encoding('UTF-8') in case of a SRU server in C4::Breeding.
    
    Same use exists in Koha::MetadataRecord::Authority::get_from_breeding().
    
    In case of import via Z3950, MarcToUTF8Record() is called,
     which calls SetMarcUnicodeFlag(),
     which calls MARC::Record->encoding('UTF-8')
    
    Test plan :
    1) Use a UNIMARC database
    2) Configure a connexion to a UNIMARC SRU, for example BNF,
       see https://doc.biblibre.com/koha/autour_de_koha/serveurs_z3950_sru#serveur_de_la_bnf
    3) Go to cataloguing module
    4) Click on 'New from Z39.50/SRU'
    5) Choose only the SRU target
    6) Search for ISBN 2266072889
    7) Confirm you see good encoding : diacritic on 'a' of title 'Strate-a-gemmes'
    8) Click on 'Marc preview'
    9) Confirm you see good encoding
    10) Click import
    11) Confirm you see good encoding
    12) Check also Authorities import via SRU
    13) Check also SRU imports on a MARC21 database
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended: Removed change to new_from_xml call. We should respect syntax.
    But the added MARC::Record encoding does the tric! Which is implicit
    for Z3950 targets where MarcToUTF8Record does the same.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 19d9ba176dea6b7816a33b014a5f9e309af53dc0)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit 79855e9f5bdbcb3bdaedd33bed574b35eee5501d)
    
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
    
    (cherry picked from commit 7494cea82f8b19028f757aa975e74da66f037a5d)
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>

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

Summary of changes:
 C4/Breeding.pm            |  2 ++
 C4/Calendar.pm            | 14 +++++++-------
 Koha/Calendar.pm          |  7 ++++---
 t/Calendar.t              |  2 --
 t/db_dependent/Holidays.t | 34 +++++++++++++++++++++++++++++++---
 5 files changed, 44 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list