[follow up](bug #3584) improve ccl detection

This improve the detection of ccl queries, and do not duplicate the "ccl=" value.

diff --git a/C4/Search.pm b/C4/Search.pm
index 257f945..8f3410f 100644 (file)
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1017,13 +1017,13 @@ sub buildQuery {
 
     my $cclq;
     my $indexes = getIndexes();
-    for my $index (@$indexes){
-        if($query =~ /($index)(,?\w)*:/){
-            $cclq = 1;
+    if( $query !~ /\s*ccl=/ ){
+        for my $index (@$indexes){
+            if($query =~ /($index)(,?\w)*:/){
+                $cclq = 1;
+            }
         }
-    }
-    if($cclq){
-        $query = "ccl=$query";
+        $query = "ccl=$query" if($cclq);
     }
 
 # for handling ccl, cql, pqf queries in diagnostic mode, skip the rest of the steps