From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Sun, 4 Dec 2011 16:29:05 +0000 (+0100)
Subject: Bug 6786: Follow up fixing index names with hyphens
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=32d8abbb43729aedfe20d30a9acc21d4f7268ec9;p=koha.git

Bug 6786: Follow up fixing index names with hyphens

Adds hyphen to regex looking for index names in buildQuery.
Test by searching on Control-number=...

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---

diff --git a/C4/Search.pm b/C4/Search.pm
index 98db88704a..fdb34790a3 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1075,7 +1075,7 @@ sub buildQuery {
     my $cclq       = 0;
     my $cclindexes = getIndexes();
     if ( $query !~ /\s*ccl=/ ) {
-        while ( !$cclq && $query =~ /(?:^|\W)(\w+)(,\w+)*[:=]/g ) {
+        while ( !$cclq && $query =~ /(?:^|\W)([\w-]+)(,[\w-]+)*[:=]/g ) {
             my $dx = lc($1);
             $cclq = grep { lc($_) eq $dx } @$cclindexes;
         }