Adapt to new kiwix-lib search API.

src/searcher/kiwix-search.cpp

@@ -80,13 +80,21 @@ int main(int argc, char **argv) {
 
   /* Try to prepare the indexing */
   try {
-      /* We will not get the snippets, So we do not need to pass the reader */
       reader = new kiwix::Reader(zimPath);
-      searcher = new kiwix::Searcher(reader);
+  } catch (...) {
+      /* Cannot open the zimPath, maybe it is a plain old xapian database directory */
+  }
+
+  if ( reader ) {
+      searcher = new kiwix::Searcher("", reader);
+  } else {
+      try {
+          searcher = new kiwix::Searcher(zimPath, NULL);
       } catch (...) {
          cerr << "Unable to search through zim '" << zimPath << "'." << endl;
          exit(1);
       }
+  }
 
   /* Start the indexing */
   if (searcher != NULL) {

src/server/kiwix-serve.cpp

@@ -856,7 +856,7 @@ int main(int argc, char **argv) {
 
 	if (!indexPath.empty()) {
 	  try {
-	    kiwix::Searcher *searcher = new kiwix::Searcher(reader);
+	    kiwix::Searcher *searcher = new kiwix::Searcher(indexPath, reader);
 	    searcher->setProtocolPrefix("/");
 	    searcher->setSearchProtocolPrefix("/search?");
 	    searcher->setContentHumanReadableId(humanReadableId);