From 5018bf35ec791af9dc7fac65ef6753a98faf74fc Mon Sep 17 00:00:00 2001
From: Gilles Crettenand <gilles@crettenand.info>
Date: Tue, 19 May 2015 12:39:15 +0200
Subject: [PATCH] Allow to avoid escaping in Solr query

---
 lib/BookSearch.php   | 6 ++++--
 mobile.netbiblio.php | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/BookSearch.php b/lib/BookSearch.php
index 2ae3de3..2a0a570 100644
--- a/lib/BookSearch.php
+++ b/lib/BookSearch.php
@@ -29,9 +29,11 @@ class BookSearch
         $this->query->addParam('q.op', 'AND');
     }
 
-    public function addQuery($queryText, $queryField = null)
+    public function addQuery($queryText, $queryField = null, $escape = true)
     {
-        $queryText= SolrUtils::escapeQueryChars($queryText);
+        if($escape) {
+            $queryText = SolrUtils::escapeQueryChars($queryText);
+        }
 
         if (strlen($queryField) > 0) {
             $queryText = "$queryField:\"$queryText\"";
diff --git a/mobile.netbiblio.php b/mobile.netbiblio.php
index 032b9c2..ad0c6df 100644
--- a/mobile.netbiblio.php
+++ b/mobile.netbiblio.php
@@ -342,9 +342,9 @@ class NetBiblio extends WebService
             });
             if (count($selectedCategories) > 0) {
                 $selectedCategories = array_map(function ($c) {
-                    return "categoryCode: $c";
+                    return 'categoryCode:'.SolrUtils::escapeQueryChars($c);
                 }, $selectedCategories);
-                $bs->addQuery('(' . implode(' OR ', $selectedCategories) . ')');
+                $bs->addQuery('('.implode(' OR ', $selectedCategories).')', null, false);
             }
         }