Bugzilla – Attachment 21831 Details for
Bug 6149
Operator Highlighted in Search Results
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 6149 - Stopwords for Result Highlighting
PASSED-QA-Bug-6149---Stopwords-for-Result-Highligh.patch (text/plain), 7.13 KB, created by
Katrin Fischer
on 2013-10-05 21:22:56 UTC
(
hide
)
Description:
[PASSED QA] Bug 6149 - Stopwords for Result Highlighting
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-10-05 21:22:56 UTC
Size:
7.13 KB
patch
obsolete
>From fc6aa73a8f0b79c6e313a14cd6ca4f2b631fe0f1 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Fri, 9 Aug 2013 14:42:00 +0100 >Subject: [PATCH] [PASSED QA] Bug 6149 - Stopwords for Result Highlighting > >This patch adds a system preference to control stopwords used to >prevent operators and other 'minor' words from being highlighted >in search results when the OpacHighlightWords syspref is enabled > >Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> > >Works as advertised, I fixed the updatedatabase to use XXX so it won't >clash as much > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Fixed a conflict in updatedatabase.pl. >Also fixed tabs in opac-detail.tt > >Feature passes all tests and QA script now. >Tested in intranet and OPAC with different words and searches. >Works on results pages and OPAC detail page. >Highlighting and unhighlighting still works correctly. >--- > installer/data/mysql/sysprefs.sql | 1 + > installer/data/mysql/updatedatabase.pl | 10 ++++++++++ > .../prog/en/modules/admin/preferences/opac.pref | 5 ++++- > .../prog/en/modules/catalogue/results.tt | 5 ++++- > koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 12 ++++++++---- > .../opac-tmpl/prog/en/modules/opac-results.tt | 4 +++- > 6 files changed, 30 insertions(+), 7 deletions(-) > >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 4b0f364..ab30a54 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -224,6 +224,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('opacheader','','70|10','Add HTML to be included as a custom header in the OPAC','Textarea'), > ('OpacHiddenItems','','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','Textarea'), > ('OpacHighlightedWords','1','','If Set, then queried words are higlighted in OPAC','YesNo'), >+('OpacHighlightedStopWords','and|And|or|Or',NULL,'List of words to NOT highlight when OpacHitHighlight is enabled','free'), > ('OpacHoldNotes','0','','Show hold notes on OPAC','YesNo'), > ('OPACItemHolds','1','','Allow OPAC users to place hold on specific items. If OFF, users can only request next available copy.','YesNo'), > ('OpacItemLocation','callnum','callnum|ccode|location','Show the shelving location of items in the opac','Choice'), >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 9871cfd..e7e7039 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -7169,6 +7169,16 @@ if ( CheckVersion($DBversion) ) { > SetVersion ($DBversion); > } > >+ >+$DBversion = "3.13.00.XXX"; >+if ( CheckVersion($DBversion) ) { >+ $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHighlightedStopWords','and|And|or|Or',NULL,'List of words to NOT highlight when OpacHitHighlight is enabled','free')" >+ ); >+ print "Upgrade to $DBversion done (Bug 6149: Operator highlighted in search results)\n"; >+ SetVersion($DBversion); >+} >+ >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >index a75c7ef..e3969fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref >@@ -135,7 +135,10 @@ OPAC: > choices: > yes: Highlight > no: "Don't highlight" >- - words the patron searched for in their search results and detail pages. >+ - words the patron searched for in their search results and detail pages; To prevent certain words from ever being highlighted, enter a list of stopwords here >+ - pref: OpacHighlightedStopWords >+ class: multi >+ - (separate columns with |) > - > - pref: AuthorisedValueImages > choices: >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index 520e6d2..5ea34f3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -1,3 +1,4 @@ >+[% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Catalog › [% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -158,7 +159,9 @@ $('#sort_by').change(function() { > function highlightOn() { > var x; > for (x in q_array) { >- if ( q_array[x].length > 0 ) { >+ q_array[x] = q_array[x].toLowerCase(); >+ var myStopwords = "[% Koha.Preference('OpacHighlightedStopWords') %]".toLowerCase().split('|'); >+ if ( (q_array[x].length > 0) && ($.inArray(q_array[x], myStopwords) == -1) ) { > toHighlight.highlight(q_array[x]); > } > } >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt >index e5d9c3c..d29aff8 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt >@@ -57,11 +57,15 @@ > } > function highlightOn() { > var x; >- for (x in q_array) { >+ for (x in q_array) { > q_array[x] = q_array[x].replace(/\w*:([\w])/, "$1"); >- $(".title").highlight(q_array[x]); >- $(".author").highlight(q_array[x]); >- $(".results_summary").highlight(q_array[x]); >+ q_array[x] = q_array[x].toLowerCase(); >+ var myStopwords = "[% Koha.Preference('OpacHighlightedStopWords') %]".toLowerCase().split('|'); >+ if( $.inArray(q_array[x], myStopwords) == -1 ) { >+ $(".title").highlight(q_array[x]); >+ $(".author").highlight(q_array[x]); >+ $(".results_summary").highlight(q_array[x]); >+ } > } > $(".highlight_toggle").toggle(); > } >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 9235b2b..08f2313 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt >@@ -100,7 +100,9 @@ function highlightOn() { > var x; > for (x in q_array) { > q_array[x] = q_array[x].replace(/\w*:([\w])/, "$1"); >- if ( q_array[x].length > 0 ) { >+ q_array[x] = q_array[x].toLowerCase(); >+ var myStopwords = "[% Koha.Preference('OpacHighlightedStopWords') %]".toLowerCase().split('|'); >+ if ( (q_array[x].length > 0) && ($.inArray(q_array[x], myStopwords) == -1) ) { > $(".title").highlight(q_array[x]); > $(".author").highlight(q_array[x]); > $(".results_summary").highlight(q_array[x]); >-- >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 6149
:
20240
|
20469
|
20540
|
20543
|
20715
|
20802
|
21168
|
21582
|
21831
|
22448
|
22463
|
22466
|
22505
|
22511
|
23005
|
23025
|
23027
|
23064
|
23065
|
23066
|
26051
|
30136
|
30137
|
30138
|
30139
|
30140
|
30141
|
30142
|
30143
|
30144
|
30835
|
30842
|
30843
|
30844
|
30845
|
30846
|
31403