[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.09-69-g65f7672

Git repo owner gitmaster at git.koha-community.org
Wed Aug 6 13:51:48 CEST 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, 3.14.x has been updated
       via  65f76726846e2e9dd38d80a8fa1891410f6100f2 (commit)
       via  18405a45959bd5aa74caaf3c0fdb0d92a153bd42 (commit)
      from  ff077e30d3c519377966e0e4715e46a2f75765d3 (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 65f76726846e2e9dd38d80a8fa1891410f6100f2
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Fri Nov 22 11:00:21 2013 +0100

    Bug 9578: avoid a search crash when attempting to sort results of invalid query
    
    When searching with a sort (means not by relevance) and there is an error
    in Zebra connexion (server is down or query is wrong), you get the message :
    
      Error : Can't call method "sort" on an undefined value at /home/kohaadmin/src/C4/Search.pm line 405.
    
    This patch corrects by not performing sort if there are no no results.
    
    Steps to reproduce the error without patch:
    
    In OPAC go to Advanced Search
    Choose "Title" in first "Search for:" end enter "ccl=( and )"
    Display "More options"
    Set "Sort by" to "Title (A-Z)"
    Click "Search" at bootom of page
    
    Result:
    Error:
    Can't call method "sort" on an undefined value at /usr/share/kohaclone/C4/Search.pm line 430.
    
    After applying the patch, try that search again.  This time,
    it should report not results found with out the error message.
    
    Alternative Test plan :
    - Set OPACdefaultSortField on something else than relevance
    - Perform a simple search with a wrong CCL query. For example : ccl=( and )
    => You get the messge : No results found ...
    
    Patch behaves as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Adds another check to prevent a bad Zebra error message.
    Works as described, passes all tests and QA script.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 3b402d04e1a321afac02da84bae12f0342b776ad)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 18405a45959bd5aa74caaf3c0fdb0d92a153bd42
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Apr 18 22:33:11 2014 +0000

    Bug 9578: add regression test
    
    This patch adds a regression test for the condition noted
    in bug 9578, where attempting a sort of a Zebra search that
    fails because of an invalid query crashes.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 70499239ba1780e872499d93fa624574d13fe7ff)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Conflicts:
    	t/db_dependent/Search.t

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

Summary of changes:
 C4/Search.pm            |    2 +-
 t/db_dependent/Search.t |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list