From e83ff6d633e4419d6f5453d5fd75d21ec0b28502 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 15 Dec 2015 10:07:39 +0000 Subject: [PATCH] Bug 9819: Make the tests pass Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall Signed-off-by: Kyle M Hall --- C4/Search.pm | 6 +++--- t/db_dependent/Search.t | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index b6cebfed2d..a2df85776d 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1451,10 +1451,10 @@ sub buildQuery { if ( @limits ) { $q .= ' and '.join(' and ', @limits); } - return ( undef, $q, $q, "q=ccl=".uri_escape_utf8($q), $q, '', '', '', '', 'ccl' ); + return ( undef, $q, $q, "q=ccl=".uri_escape_utf8($q), $q, '', '', '', 'ccl' ); } if ( $query =~ /^cql=/ ) { - return ( undef, $', $', "q=cql=".uri_escape_utf8($'), $', '', '', '', '', 'cql' ); + return ( undef, $', $', "q=cql=".uri_escape_utf8($'), $', '', '', '', 'cql' ); } if ( $query =~ /^pqf=/ ) { if ($query_desc) { @@ -1463,7 +1463,7 @@ sub buildQuery { $query_desc = $'; $query_cgi = "q=pqf=".uri_escape_utf8($'); } - return ( undef, $', $', $query_cgi, $query_desc, '', '', '', '', 'pqf' ); + return ( undef, $', $', $query_cgi, $query_desc, '', '', '', 'pqf' ); } # pass nested queries directly diff --git a/t/db_dependent/Search.t b/t/db_dependent/Search.t index cde59bd820..c61c5832e2 100644 --- a/t/db_dependent/Search.t +++ b/t/db_dependent/Search.t @@ -968,12 +968,12 @@ sub run_unimarc_search_tests { } subtest 'MARC21 + GRS-1' => sub { - plan tests => 110; + plan tests => 107; run_marc21_search_tests('grs1'); }; subtest 'MARC21 + DOM' => sub { - plan tests => 110; + plan tests => 107; run_marc21_search_tests('dom'); }; -- 2.39.5