Bugzilla – Attachment 15865 Details for
Bug 9239
Koha should share Evergreen's QueryParser module for parsing queries
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9239 QA follow-up: fix highlighting and merge error
Bug-9239-QA-follow-up-fix-highlighting-and-merge-e.patch (text/plain), 2.60 KB, created by
Jared Camins-Esakov
on 2013-03-04 22:03:19 UTC
(
hide
)
Description:
Bug 9239 QA follow-up: fix highlighting and merge error
Filename:
MIME Type:
Creator:
Jared Camins-Esakov
Created:
2013-03-04 22:03:19 UTC
Size:
2.60 KB
patch
obsolete
>From 13eed6a32a8401ea9843a8767278ba7bfceedea8 Mon Sep 17 00:00:00 2001 >From: Jared Camins-Esakov <jcamins@cpbibliography.com> >Date: Mon, 4 Mar 2013 12:55:12 -0500 >Subject: [PATCH] Bug 9239 QA follow-up: fix highlighting and merge error > >QP searches with && broke search highlighting on the OPAC details page. >This patch corrects encoding of the query_desc parameter that is passed >to the details page. > >My last attempt at rebasing also transposed the variable for index >names with the variable for operators, meaning that the dropdown in >the basic search did not work. >--- > C4/Search.pm | 2 +- > .../prog/en/modules/opac-results-grouped.tt | 2 +- > .../opac-tmpl/prog/en/modules/opac-results.tt | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > >diff --git a/C4/Search.pm b/C4/Search.pm >index cdddbaa..9e8437b 100644 >--- a/C4/Search.pm >+++ b/C4/Search.pm >@@ -1188,7 +1188,7 @@ sub parseQuery { > $query .= $operators[ $ii - 1 ] eq 'or' ? ' || ' : ' && ' > if ($query); > $query .= >- ( $operators[$ii] ? "$operators[$ii]:" : '' ) . $operands[$ii]; >+ ( $indexes[$ii] ? "$indexes[$ii]:" : '' ) . $operands[$ii]; > } > foreach my $limit (@limits) { > } >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt >index a461800..70aae62 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tt >@@ -17,7 +17,7 @@ var q_array = new Array(); // will hold the search terms, if possible > $(document).ready(function(){ > [% IF ( OpacHighlightedWords ) %] > $('a.title').each(function() { >- $(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | url %]'); >+ $(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | uri %]'); > }); > [% END %] > >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt >index 30682c4..04d02ba 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt >@@ -105,7 +105,7 @@ function highlightOn() { > $(document).ready(function(){ > [% IF ( OpacHighlightedWords ) %] > $('a.title').each(function() { >- $(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | url %]'); >+ $(this).attr('href', $(this).attr('href') + '&query_desc=[% query_desc | uri %]'); > }); > [% END %] > >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 9239
:
14020
|
14021
|
14022
|
14023
|
14172
|
14173
|
14174
|
14175
|
14180
|
14181
|
14182
|
14183
|
14847
|
14949
|
14950
|
14951
|
14952
|
14953
|
15121
|
15437
|
15865
|
15867
|
15929
|
15999
|
16004
|
16051
|
16125
|
16130
|
16131
|
16132
|
16133
|
16136
|
16140
|
16141
|
16142
|
16143
|
16144
|
16145
|
16146
|
16147
|
16148
|
16149
|
16150
|
16151
|
16152
|
16153
|
16154
|
16155
|
16180
|
16181
|
16182
|
16183
|
16184
|
16185
|
16186
|
16187
|
16188
|
16189
|
16190
|
16191
|
16192
|
16193
|
16194
|
16195