From a4d48140b6e10a4a66fcf1630eb2969af95104b1 Mon Sep 17 00:00:00 2001
From: Paul POULAIN <paul.poulain@biblibre.com>
Date: Sat, 26 Mar 2011 18:24:19 -0400
Subject: [PATCH] Bug 3629 : search limit by group is not OK

MT4491 : limitation by library group

- the group list was not displayed in OPAC (even if everything else was here
- the group limit was not working due to a missing ()

author=jean et group=droit" resulted in:
author=jean and branch=b1 or branch=b2 or branch=b3
that is wrong (executed from left to right)

the fix add () to have :
author=jean and (branch=b1 or branch=b2 or branch=b3)
that is OK

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 091d3100169a12e9498f6d58c8b61ac01a5a5db6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
---
 catalogue/search.pl                                    |  2 +-
 .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl      | 10 +++++++++-
 opac/opac-search.pl                                    |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/catalogue/search.pl b/catalogue/search.pl
index 8cb737d323..426bf2ea2f 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -380,7 +380,7 @@ my @limits;
 @limits = split("\0",$params->{'limit'}) if $params->{'limit'};
 
 if($params->{'multibranchlimit'}) {
-push @limits, join(" or ", map { "branch: $_ "}  @{GetBranchesInCategory($params->{'multibranchlimit'})}) ;
+    push @limits, '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
 }
 
 my $available;
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 eb9b811bc4..1fc4f8aca9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
@@ -245,7 +245,15 @@
         <!--/TMPL_IF-->    
         <!-- /TMPL_LOOP -->
         </select>
-        
+        <!-- TMPL_IF NAME="searchdomainloop" -->
+            <p>OR</p> <!-- should addjs to grey out group pulldown if a library is selected. -->
+                <label for="categoryloop">Groups of Libraries</label><select name="multibranchlimit" id="categoryloop">
+                <option value=""> -- none -- </option>
+                <!-- TMPL_LOOP NAME="searchdomainloop" -->
+                <option value="<!-- TMPL_VAR NAME="categorycode" -->"><!-- TMPL_VAR NAME="categoryname" --></option>
+                <!-- /TMPL_LOOP -->
+                </select>
+        <!-- /TMPL_IF -->        
         <div style="margin-top:.4em"><label for="available-items"><input type="checkbox" id="available-items" name="limit" value="available" /> Only items currently available for loan or reference</label></div>
     </fieldset></div>
     <!-- /TMPL_UNLESS -->
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 034675ef12..ee7f3ba9ec 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -315,7 +315,7 @@ my @limits;
 @limits = split("\0",$params->{'limit'}) if $params->{'limit'};
 
 if($params->{'multibranchlimit'}) {
-push @limits, join(" or ", map { "branch: $_ "}  @{GetBranchesInCategory($params->{'multibranchlimit'})}) ;
+    push @limits, '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
 }
 
 my $available;
-- 
2.39.5