[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.07-19-g8bcafbe3cf

Git repo owner gitmaster at git.koha-community.org
Wed Feb 5 23:01:36 CET 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  8bcafbe3cfa15974b34c8bb8dc9d10f72205283e (commit)
       via  3e5eb8aacf39cab5bac519f9b173ba5a6c34abf3 (commit)
      from  a273c604db5ebad8aef2b1076a0a5870783ba06e (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 8bcafbe3cfa15974b34c8bb8dc9d10f72205283e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Dec 27 14:55:36 2019 +0100

    Bug 24313: Always display XSLT errors in logs
    
    From
      commit 295ae33800a322facfdf56795f4c02b2fd53432b
      Bug 20272: Replace error numbers by codes in XSLT_Handler
    
    """
        Make XSLT_Handler a little bit less noisy by defaulting print_warns to
        false unless $ENV{DEBUG} is set. (See also bug 19018).
    """
    
    I think we should warn the errors in the logs. They are not debug messages here, we should not rely on DEBUG.
    If too noisy we should fix the original issues, not hide all the errors (which make the XSLT debugging super hard)
    
    Test plan:
    Break a XSLT, reload the page and confirm that there are useful errors in the Koha log file
    
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit ec79582374c829049ebac891644fb9f6e30a9614)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 3e5eb8aacf39cab5bac519f9b173ba5a6c34abf3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Dec 10 15:24:36 2019 +0100

    Bug 24123: Fix import of UTF-8 encoded MARC21 MARCXML using bulkmarcimport (elastic only)
    
    If elastic is used as search engine, the bulkmarcimport.pl will not
    handle correctly UTF-8 encoded MARCXML
    
    Koha::SearchEngine::Search->new uses a require statement to load the correct Search module.
    This is done l.257 of bulkmarcimport.pl:
      257 my $searcher = Koha::SearchEngine::Search->new
    
    Koha::SearchEngine::Elasticsearch::Search will `use MARC::File::XML`, and so resets the arguments set before:
      216     $MARC::File::XML::_load_args{BinaryEncoding} = 'utf-8';
    
      220     $MARC::File::XML::_load_args{RecordFormat} = $recordformat;
    
    An easy (but dirty) fix could be to move the declaration of my $searcher before in the script.
    The tricky (but correct) fix would be to remove the long standing "ugly hack follows" comment.
    
    This patch is the easy, and dirty, fix
    
    Test plan:
    Use the command line tool to import MARXCML records that contains unicode characters into Koha
    
    Something like `misc/migration_tools/bulkmarcimport.pl -biblios -file record.marcxml -m=MARCXML`
    
    Without this patch you will notice that unicode characters will not be displayed correctly
    
    Signed-off-by: Michal Denar <black23 at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit b11946bc377ec2c6474f9dc2192fda8188c86888)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 Koha/XSLT_Handler.pm                   |  4 +---
 misc/migration_tools/bulkmarcimport.pl | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list