+ 2nd regression fix

src/server/kiwix-serve.cpp

@@ -416,6 +416,29 @@ int main(int argc, char **argv) {
 
   /* Instanciate the ZIM index (if necessary) */
   if (indexPath != "") {
+
+    /* Try with the XapianSearcher */
+    try {
+      searcher = new kiwix::XapianSearcher(indexPath);
+      hasSearchIndex = true;
+    } catch (...) {
+      cerr << "Unable to open the search index '" << zimPath << "' with the XapianSearcher." << endl; 
+    }
+
+    /* Try with the CluceneSearcher */
+    if (!hasSearchIndex) {
+      try {
+	searcher = new kiwix::CluceneSearcher(indexPath);
+	hasSearchIndex = true;
+      } catch (...) {
+	cerr << "Unable to open the search index '" << zimPath << "' with the CluceneSearcher." << endl; 
+	exit(1);
+      }
+    }
+
+    /* searcher configuration */
+    if (hasSearchIndex) {
+
       /* Change the current dir to binary dir */
       /* Non portable linux solution */
       readlink("/proc/self/exe", rootPath, PATH_MAX);
@@ -444,28 +467,9 @@ int main(int argc, char **argv) {
 	exit(1);
       }
       
-    /* Try with the XapianSearcher */
-    try {
-      searcher = new kiwix::XapianSearcher(indexPath);
-      hasSearchIndex = true;
-    } catch (...) {
-      cerr << "Unable to open the search index '" << zimPath << "' with the XapianSearcher." << endl; 
-    }
-
-    /* Try with the CluceneSearcher */
-    if (!hasSearchIndex) {
-      try {
-	searcher = new kiwix::CluceneSearcher(indexPath);
-	hasSearchIndex = true;
-      } catch (...) {
-	cerr << "Unable to open the search index '" << zimPath << "' with the CluceneSearcher." << endl; 
-	exit(1);
-      }
-    }
-
-  /* searcher configuration */
       searcher->setProtocolPrefix("/");
       searcher->setSearchProtocolPrefix("/search?");
+    }
 
   } else {
     hasSearchIndex = false;