Bugzilla – Attachment 15217 Details for
Bug 9395
Problem with callnumber and standard number search in OPAC and Staff Client
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 9395: Problem with callnumber and standard number searches
SIGNED-OFF-Bug-9395-Problem-with-callnumber-and-st.patch (text/plain), 10.78 KB, created by
Katrin Fischer
on 2013-02-11 06:47:42 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 9395: Problem with callnumber and standard number searches
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-02-11 06:47:42 UTC
Size:
10.78 KB
patch
obsolete
>From b74d5bac6cffcc30c68388390c2bd940d4daa359 Mon Sep 17 00:00:00 2001 >From: Vitor FERNANDES <vfernandes@keep.pt> >Date: Tue, 15 Jan 2013 17:19:59 +0000 >Subject: [PATCH] [SIGNED-OFF] Bug 9395: Problem with callnumber and standard > number searches > >This problem happens because there isn't a operator "phr" in the values >of callnumber and standard number search. So many results aren't the >corrects ones. > >Test plan: > >- Apply the patch >- In the dropbox search menu of OPAC main page header, the callnum > should have only callnum >- In OPAC advanced search the callnumber and standard number options > shouldn't have "phr" >- In staff client advanced search the callnumber and standard number > options shouldn't have "phr" >- Change OPACNumbersPreferPhrase and IntranetNumbersPreferPhrase to "use" >- The options listed before should use now the operator "phr" >- This will resolve the problems with the searches of callnumbers and > standard numbers in OPAC and staff client (spaces problems, no > results, inconsistent results, etc...) > >Sponsored-by: KEEP SOLUTIONS >Signed-off-by: Owen Leonard <oleonard@myacpl.org> > >I don't know how to reproduce the searching problems described in the >bug, but I can confirm that the patch works correctly to enable/disable >the use of 'phr' in the searches described in the test plan. > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >System preferences work as described, switching indexes in >OPAC and staff. >All tests and QA script pass. >--- > catalogue/search.pl | 3 +++ > installer/data/mysql/sysprefs.sql | 2 ++ > installer/data/mysql/updatedatabase.pl | 7 +++++++ > .../prog/en/includes/search_indexes.inc | 8 ++++++++ > .../en/modules/admin/preferences/searching.pref | 16 ++++++++++++++++ > koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 14 +++++++++++--- > .../opac-tmpl/prog/en/modules/opac-advsearch.tt | 13 +++++++++++++ > opac/opac-main.pl | 4 ++++ > opac/opac-search.pl | 5 +++++ > 9 files changed, 69 insertions(+), 3 deletions(-) > >diff --git a/catalogue/search.pl b/catalogue/search.pl >index d1a3ca2..680f837 100755 >--- a/catalogue/search.pl >+++ b/catalogue/search.pl >@@ -182,6 +182,9 @@ else { > if (C4::Context->preference("marcflavour") eq "UNIMARC" ) { > $template->param('UNIMARC' => 1); > } >+if (C4::Context->preference("IntranetNumbersPreferPhrase")) { >+ $template->param('numbersphr' => 1); >+} > > if($cgi->cookie("holdfor")){ > my $holdfor_patron = GetMember('borrowernumber' => $cgi->cookie("holdfor")); >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 9032bfa..46c2371 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -411,3 +411,5 @@ INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ( > INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('IDreamBooksReviews','0','Display book review snippets from IDreamBooks.com','','YesNo'); > INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('IDreamBooksReadometer','0','Display Readometer from IDreamBooks.com','','YesNo'); > INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('IDreamBooksResults','0','Display IDreamBooks.com rating in search results','','YesNo'); >+INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OPACNumbersPreferPhrase','0', NULL, 'Control the use of phr operator in callnumber and standard number OPAC searches', 'YesNo'); >+INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('IntranetNumbersPreferPhrase','0', NULL, 'Control the use of phr operator in callnumber and standard number staff client searches', 'YesNo'); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index ed922b8..f609efd 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -6399,6 +6399,13 @@ if ( CheckVersion($DBversion) ) { > SetVersion($DBversion); > } > >+$DBversion = "3.11.00.XXX"; >+if ( CheckVersion($DBversion) ) { >+ $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('OPACNumbersPreferPhrase','0', NULL, 'Control the use of phr operator in callnumber and standard number OPAC searches', 'YesNo')"); >+ $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('IntranetNumbersPreferPhrase','0', NULL, 'Control the use of phr operator in callnumber and standard number staff client searches', 'YesNo')"); >+ print "Upgrade to $DBversion done (Bug 9395: Problem with callnumber and standard number search in OPAC and Staff Client)\n"; >+ SetVersion ($DBversion); >+} > > =head1 FUNCTIONS > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc >index 8102201..faabc42 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc >@@ -20,10 +20,18 @@ > [% END %] > <option value="bc">Barcode</option> > <option value="location">Shelving location</option> >+ [% IF (numbersphr) %] >+ <option value="sn,phr">Standard number</option> >+ [% ELSE %] > <option value="sn">Standard number</option> >+ [% END %] > <option value="nb"> ISBN</option> > <option value="ns"> ISSN</option> >+ [% IF (numbersphr) %] >+ <option value="callnum,phr"> Call number</option> >+ [% ELSE %] > <option value="callnum"> Call number</option> >+ [% END %] > <option value="ln,rtrn">Language</option> > <option value="nt">Notes/Comments</option> > [% IF (marcflavour != 'UNIMARC' ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref >index 7b99173..451cbc9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref >@@ -79,6 +79,22 @@ Searching: > yes: show > no: "don't show" > - '"More options" on the OPAC and staff advanced search pages.' >+ - >+ - By default, >+ - pref: OPACNumbersPreferPhrase >+ type: boolean >+ choices: >+ yes: use >+ no: "don't use" >+ - 'the operator "phr" in the callnumber and standard number OPAC searches' >+ - >+ - By default, >+ - pref: IntranetNumbersPreferPhrase >+ type: boolean >+ choices: >+ yes: use >+ no: "don't use" >+ - 'the operator "phr" in the callnumber and standard number staff client searches' > Results Display: > - > - By default, sort search results in the staff client by >diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc >index 87e35a6..35db422 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc >@@ -66,11 +66,19 @@ > [% ELSE %] > <option value="se">Series</option> > [% END %] >- [% IF ( ms_callnum ) %] >+ [% IF ( numbersphr ) %] >+ [% IF ( ms_callnum ) %] >+ <option selected="selected" value="callnum,phr">Call number</option> >+ [% ELSE %] >+ <option value="callnum,phr">Call number</option> >+ [% END %] >+ [% ELSE %] >+ [% IF ( ms_callnum ) %] > <option selected="selected" value="callnum">Call number</option> >- [% ELSE %] >+ [% ELSE %] > <option value="callnum">Call number</option> >- [% END %]</select> >+ [% END %] >+ [% END %]</select> > [% IF ( ms_value ) %] > <input type="text" title="Type search term" id = "transl1" name="q" value="[% ms_value |html %]" class="left" style="width: 35%; font-size: 111%;"/><div id="translControl"></div> > [% ELSE %] >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt >index be2a6f7..825e8be 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt >@@ -77,7 +77,11 @@ > [% IF ( expanded_options ) %] > <option value="ti,phr"> Title phrase</option> > <option value="se,wrdl">Series title</option> >+ [% IF ( numbersphr) %] >+ <option value="callnum,phr">Call number</option> >+ [% ELSE %] > <option value="callnum">Call number</option> >+ [% END %] > <option value="location">Shelving location</option> > [% END %] > <option value="au,wrdl">Author</option> >@@ -99,10 +103,19 @@ > <option value="pb,wrdl">Publisher</option> > <option value="pl,wrdl">Publisher location</option> > [% IF ( expanded_options ) %] >+ [% IF ( numbersphr) %] >+ <option value="sn,phr">Standard number</option> >+ [% ELSE %] >+ <option value="sn">Standard number</option> >+ [% END %] > <option value="sn">Standard number</option> > <option value="nb"> ISBN</option> > <option value="ns"> ISSN</option> >+ [% IF ( numbersphr) %] > <option value="lcn,phr"> Call number</option> >+ [% ELSE %] >+ <option value="lcn"> Call number</option> >+ [% END %] > [% ELSE %] > <option value="nb">ISBN</option> > [% END %] >diff --git a/opac/opac-main.pl b/opac/opac-main.pl >index c716c60..7c6ee36 100755 >--- a/opac/opac-main.pl >+++ b/opac/opac-main.pl >@@ -65,4 +65,8 @@ if (C4::Context->preference('GoogleIndicTransliteration')) { > $template->param('GoogleIndicTransliteration' => 1); > } > >+if (C4::Context->preference('OPACNumbersPreferPhrase')) { >+ $template->param('numbersphr' => 1); >+} >+ > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/opac/opac-search.pl b/opac/opac-search.pl >index 97a7bc4..4744ac6 100755 >--- a/opac/opac-search.pl >+++ b/opac/opac-search.pl >@@ -293,6 +293,11 @@ if ( $template_type && $template_type eq 'advsearch' ) { > $template->param( expanded_options => $cgi->param('expanded_options')); > } > } >+ >+ if (C4::Context->preference('OPACNumbersPreferPhrase')) { >+ $template->param('numbersphr' => 1); >+ } >+ > output_html_with_http_headers $cgi, $cookie, $template->output; > exit; > } >-- >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 9395
:
14606
|
15063
| 15217