Fix for bug 2342: Searching on more than 1 itemtype breaks

The problem was that the 'mc-' was removed from the checkboxes a while back and
that's what triggers the automatic application of OR boolean searching. I've
added it back to the templates and modified the ccl.properties file to include
mapping for itype,itemtype and ccode

diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties
index 879ded5..775feed 100644 (file)
--- a/etc/zebradb/ccl.properties
+++ b/etc/zebradb/ccl.properties
@@ -931,6 +931,7 @@ totalissues 1=9003
 cn-bib-source 1=9004
 cn-bib-sort 1=9005
 itemtype 1=9006
+mc-itemtype itemtype
 cn-class 1=9007
 cn-item 1=9008 
 cn-prefix 1=9009
@@ -952,6 +953,7 @@ restricted 1=8006
 cn-sort 1=8007
 notforloan 1=8008
 ccode 1=8009
+mc-ccode ccode
 itemnumber 1=8010
 # homebranch 1=8011
 homebranch 1=homebranch
@@ -978,7 +980,7 @@ uri 1=8028
 replacementprice 1=8029
 replacementpricedate 1=8030
 itype 1=8031
-mc itype
+mc-itype itype
 
 #date1 1=8801
 #date2 1=8802

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
index d58ad06..f343e0c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -91,7 +91,7 @@
       <!--TMPL_LOOP Name="itemtypeloop"-->
         <td>
         <!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->
-               <input type="checkbox" id="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->" name="limit" value="<!-- TMPL_VAR NAME="ccl" -->:<!--TMPL_VAR Name="code" -->" />&nbsp;
+               <input type="checkbox" id="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->" name="limit" value="mc-<!-- TMPL_VAR NAME="ccl" -->:<!--TMPL_VAR Name="code" -->" />&nbsp;
         <label for="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->"><!--TMPL_VAR Name="description" --></label></td>
         <!-- TMPL_UNLESS name="count5" --></tr><tr><!-- /TMPL_UNLESS -->
       <!--/TMPL_LOOP-->

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
index 631f8b4..450d618 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
@@ -195,7 +195,7 @@
     <table>
         <tr>
       <!--TMPL_LOOP Name="itemtypeloop"-->
-        <td><input type="checkbox" id="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->" name="limit" value="<!-- TMPL_VAR NAME="ccl" -->:<!--TMPL_VAR Name="code" -->"/><!-- TMPL_IF name="imageurl"--><!-- TMPL_IF NAME="imageurl" --><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF --><!-- /TMPL_IF -->&nbsp;
+        <td><input type="checkbox" id="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->" name="limit" value="mc-<!-- TMPL_VAR NAME="ccl" -->:<!--TMPL_VAR Name="code" -->"/><!-- TMPL_IF name="imageurl"--><!-- TMPL_IF NAME="imageurl" --><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF --><!-- /TMPL_IF -->&nbsp;
         <!--TMPL_VAR Name="description" --></td>
         <!-- TMPL_UNLESS name="count5" --></tr><tr><!-- /TMPL_UNLESS -->
       <!--/TMPL_LOOP-->