From 311f783ea92d67a85e4840c45b9c2f8369bcc935 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Thu, 17 Mar 2022 15:48:59 +0100
Subject: [PATCH] Always use the search pattern when searching in the server.

There is no reason to not use the pattern if there is a geo_query.
If both the pattern and the qeo_query are provided, we must use both.
---
 src/server/internalServer.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp
index 9d61f042..0c45580a 100644
--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
@@ -140,19 +140,18 @@ SearchInfo::SearchInfo(const RequestContext& request)
 
 zim::Query SearchInfo::getZimQuery(bool verbose) const {
   zim::Query query;
-  if(pattern.empty()) {
-    // Execute geo-search
+  if (verbose) {
+    std::cout << "Performing query '" << pattern<< "'";
+  }
+  query.setQuery(pattern);
+  if (geoQuery) {
     if (verbose) {
-      cout << "Performing geo query `" << geoQuery.distance << "&(" << geoQuery.latitude << ";" << geQuery.longitude << ")'" << endl;
+      std::cout << " with geo query '" << geoQuery.distance << "&(" << geoQuery.latitude << ";" << geoQuery.longitude << ")'";
     }
-    query.setQuery("");
     query.setGeorange(geoQuery.latitude, geoQuery.longitude, geoQuery.distance);
-  } else {
-    // Execute Ft search
-    if (verbose) {
-      cout << "Performing query `" << pattern << "'" << endl;
-    }
-    query.setQuery(pattern);
+  }
+  if (verbose) {
+    std::cout << std::endl;
   }
   return query;
 }