Release 3.1.2

Use new suggestion API of kiwix-lib.

Changelog

@@ -1,3 +1,13 @@
+kiwix-tools 3.1.2
+=================
+
+ * Use new threadsafe API of kiwix-lib to do suggestions search.
+
+kiwix-tools 3.1.1
+=================
+
+ * Fix compilation on Windows' CI
+
 kiwix-tools 3.1.0
 =================
 

meson.build

@@ -1,5 +1,5 @@
 project('kiwix-tools', 'cpp',
-  version : '3.1.0',
+  version : '3.1.2',
   license : 'GPL',
   default_options: ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
 
@@ -13,7 +13,7 @@ if static_linkage
 endif
 
 thread_dep = dependency('threads')
-kiwixlib_dep = dependency('kiwix', version:'>=9.1.0', static:static_linkage)
+kiwixlib_dep = dependency('kiwix', version:'>=9.3.0', static:static_linkage)
 microhttpd_dep = dependency('libmicrohttpd', static:static_linkage)
 z_dep = dependency('zlib', static:static_linkage)
 

src/reader/kiwix-read.cpp

@@ -90,10 +90,10 @@ int main(int argc, char** argv)
 
     if (pattern != NULL) {
       std::cout << "Searching suggestions for: " << pattern << std::endl;
-
-      reader->searchSuggestionsSmart(pattern, 10);
-      while (reader->getNextSuggestion(suggestion)) {
-        std::cout << suggestion << std::endl;
+      kiwix::SuggestionsList_t suggestions;
+      reader->searchSuggestionsSmart(pattern, 10, suggestions);
+      for (auto& suggestion: suggestions) {
+        std::cout << suggestion[0] << std::endl;
       }
     }
 

src/server/kiwix-serve.cpp

@@ -23,7 +23,9 @@
 #include <kiwix/name_mapper.h>
 #include <kiwix/tools/otherTools.h>
 
-#ifndef _WIN32
+#ifdef _WIN32
+# include <windows.h>
+#else
 # include <unistd.h>
 #endif