[Hack] Multiple spelling corrections are returned

.github/workflows/ci.yml

@@ -69,7 +69,7 @@ jobs:
         run: meson test -C build --verbose
 
   Windows:
-    runs-on: windows-2025
+    runs-on: windows-2022
 
     steps:
       - name: Checkout code

ChangeLog

@@ -1,33 +1,7 @@
-libkiwix 14.2.1
-===============
-
- * Documentation fix (@bperlakih #1277)
- * Fix kiwix-serve unit-test for libmicrohttpd 1.x (@veloman-yunkan #1293)
- * Fix kiwix-server error message for requests with wrong root URL prefix (@veloman-yunkan #1294)
-
-libkiwix 14.2.0
-===============
-
- * Server:
-  - Add 10.211 IPv4 range to known local ranges (@kelson42 #1273)
-  - Fix regression to properly deal with IPv4-only systems (@veloman-yunkan #1272)
-  - Improve mgmt of empty search input (@pippotadde #1255 #1258 #1259)
-  - Remove pagination for OPDS/Atom feed URL (@kelson42 #1274)
-  - Updated documentation of lang and category filters in catalog query API endpoints (@veloman-yunkan #804)
-
- * Other
-  - Optimized (speed) removeAccents() for ASCII-only input (@veloman-yunkan #1276)
-  - Fix a few stability, correctness, and memory problems (@shbhmexe #1261)
-  - Introduce Manager::addBooksFromDirectory (@juuz0 #1220)
-
- * Compilation
-  - Move MS Windows CI to 2025 runner (@kelson42 #1269)
-  - Fix readthedocs update process (@kelson42 #1247)
-
 libkiwix 14.1.1
 ===============
 
- * Server:
+* Server:
   - Fix regression for kiwix-serve --nosearchbar (@veloman-yunkan #1250)
   - Avoid results content interpretation... crash in fulltext search (@vighnesh-sawant #1241)
   - Fix for intermittent /content/blank.html errors (@veloman-yunkan #1249)

docs/conf.py

@@ -18,7 +18,7 @@ import os
 # -- Project information -----------------------------------------------------
 
 project = 'libkiwix'
-copyright = '2026, libkiwix-team'
+copyright = '2022, libkiwix-team'
 author = 'libkiwix-team'
 
 

include/common.h

@@ -14,43 +14,12 @@
 #endif
 
 
-namespace kiwix
-{
-
-/**
- * `IpMode` is used to [configure](@ref Server::setIpMode()) a `Server` object
- * to listen for incoming connections not on a single IP address but on all
- * addresses of the specified family.
- */
-enum class IpMode
-{
-  /**
-   * Listen on all IPv4 addresses.
-   */
-  IPV4,
-
-  /**
-   * Listen on all IPv6 addresses.
-   */
-  IPV6,
-
-  /**
-   * Listen on all available addresses.
-   */
-  ALL,
-
-  /**
-   * `IpMode::AUTO` (which is the default) must be used when an explicit
-   * (non-empty) IP address for listening is provided via
-   * `Server::setAddress()`. If no such address is enforced, then
-   * `IpMode::AUTO` is equivalent to `IpMode::ALL`.
-   */
-  AUTO
-};
+namespace kiwix {
 
+enum class IpMode { IPV4, IPV6, ALL, AUTO }; // AUTO: Server decides the protocol
 typedef zim::size_type size_type;
 typedef zim::offset_type offset_type;
 
-} // namespace kiwix
+}
 
 #endif //_KIWIX_COMMON_H_

include/library.h

@@ -444,11 +444,11 @@ class Library: public std::enable_shared_from_this<Library>
 
 
   /**
-   * Sort (in place) bookIds using the given arguments.
+   * Sort (in place) bookIds using the given comparator.
    *
    * @param bookIds the list of book Ids to sort
-   * @param sortBy how to sort the books (UNSORTED, TITLE, SIZE, DATE, CREATOR, PUBLISHER)
-   * @param ascending ascending or descending
+   * @param comparator how to sort the books
+   * @return The sorted list of books
    */
   void sort(BookIdCollection& bookIds, supportedListSortBy sortBy, bool ascending) const;
 

include/manager.h

@@ -155,15 +155,6 @@ class Manager
                        const std::string& url = "",
                        const bool checkMetaData = false);
 
-  /**
-   * Add all books from the directory tree into the library.
-   * 
-   * @param path          The path of the directory to scan.
-   * @param verboseFlag   Verbose logs flag.
-   */
-  void addBooksFromDirectory(const std::string& path,
-                             const bool verboseFlag = false);
-
   std::string writableLibraryPath;
 
   bool m_hasSearchResult = false;

include/server.h

@@ -42,7 +42,7 @@ namespace kiwix
        virtual ~Server();
 
        /**
-        * Start serving the content.
+        * Serve the content.
         */
        bool start();
 
@@ -51,27 +51,9 @@ namespace kiwix
         */
        void stop();
 
-       /**
-        * Set the path of the root URL served by this server instance.
-        */
        void setRoot(const std::string& root);
-
-       /**
-        * Set the IP address on which to listen for incoming connections.
-        *
-        * Specifying a non-empty IP address requires that the IpMode is
-        * [set](@ref setIpMode()) to `IpMode::AUTO` (which is the default).
-        * Otherwise, [starting](@ref start()) the server will fail.
-        */
        void setAddress(const std::string& addr);
-
-       /**
-        * Set the port on which to listen for incoming connections.
-        *
-        * Default port is 80, but using it requires special privileges.
-        */
        void setPort(int port) { m_port = port; }
-
        void setNbThreads(int threads) { m_nbThreads = threads; }
        void setMultiZimSearchLimit(unsigned int limit) { m_multizimSearchLimit = limit; }
        void setIpConnectionLimit(int limit) { m_ipConnectionLimit = limit; }
@@ -83,50 +65,10 @@ namespace kiwix
         { m_blockExternalLinks = blockExternalLinks; }
        void setCatalogOnlyMode(bool enable) { m_catalogOnlyMode = enable; }
        void setContentServerUrl(std::string url) { m_contentServerUrl = url; }
-
-       /**
-        * Listen for incoming connections on all IP addresses of the specified
-        * IP protocol family.
-        */
        void setIpMode(IpMode mode) { m_ipMode = mode; }
-
-       /**
-        * Get the port on which the server listens for incoming connections
-        */
        int getPort() const;
-
-       /**
-        * Get the IPv4 and/or IPv6 address(es) on which the server can be
-        * contacted.
-        *
-        * The server may actually be listening on other IP addresses as well
-        * (see `setIpMode()`).  The IP address(es) returned by this method
-        * represent the best-guess public IP address(es) accessible by the
-        * broadest set of clients.
-        */
        IpAddress getAddress() const;
-
-       /**
-        * Get the effective IpMode used by this server.
-        *
-        * The returned value may be different from the one configured via
-        * `setIpMode()`, since the server is expected to adjust to the
-        * constraints of the environment (e.g. `IpMode::ALL` can be converted
-        * to `IpMode::IPV4` on a system that does not support IPv6).
-        */
        IpMode getIpMode() const;
-
-       /**
-        * Get the list of HTTP URLs through which the server can be contacted.
-        *
-        * Each URL is composed of an IP address and optional port and includes
-        * the [root](@ref setRoot()) path component.
-        *
-        * In the current implementation at most 2 URLs may be returned - one
-        * for IPv4 and another for IPv6 protocol (whichever is available), as
-        * returned by `getAddress()`. Note, however, that the server may be
-        * also accessible via other IP-addresses/URLs (see `setIpMode()`).
-        */
        std::vector<std::string> getServerAccessUrls() const;
 
      protected:

include/spelling_correction.h

@@ -32,7 +32,7 @@ class Archive;
 
 namespace Xapian
 {
-class Database;
+class WritableDatabase;
 }
 
 namespace kiwix
@@ -50,7 +50,7 @@ public: // functions
   std::vector<std::string> getSpellingCorrections(const std::string& word, uint32_t maxCount) const;
 
 private: // data
-  std::unique_ptr<Xapian::Database> impl_;
+  std::unique_ptr<Xapian::WritableDatabase> impl_;
 };
 
 } // namespace kiwix

include/tools.h

@@ -29,13 +29,10 @@
 namespace kiwix
 {
 
-/**
- * An IPv4 and/or IPv6 address.
- */
 struct IpAddress
 {
-    std::string addr;  /**< IPv4 address */
-    std::string addr6; /**< IPv6 address */
+    std::string addr;  // IPv4 address
+    std::string addr6; // IPv6 address
 };
 
 typedef std::pair<std::string, std::string> LangNameCodePair;
@@ -266,7 +263,7 @@ std::string getLanguageSelfName(const std::string& lang);
  * Slugifies the filename by converting any characters reserved by the operating
  * system to '_'. Note filename is only the file name and not a path.
  *
- * @param filename Valid UTF-8 encoded file name string.
+ * @param filename Valid UTF-8 encoded file name string. 
  * @return slugified string.
  */
 std::string getSlugifiedFileName(const std::string& filename);

meson.build

@@ -1,5 +1,5 @@
 project('libkiwix', 'cpp',
-  version : '14.2.1',
+  version : '14.1.1',
   license : 'GPLv3+',
   default_options : ['c_std=c11', 'cpp_std=c++17', 'werror=true'])
 

src/book.cpp

@@ -242,7 +242,7 @@ const std::string& Book::Illustration::getData() const
       try {
         data = download(url);
       } catch(...) {
-        std::cerr << "Cannot download favicon from " << url << std::endl;
+        std::cerr << "Cannot download favicon from " << url;
       }
     }
   }

src/downloader.cpp

@@ -245,7 +245,7 @@ std::shared_ptr<Download> Downloader::getDownload(const std::string& did)
         return m_knownDownloads[gid];
       }
     }
-    throw;
+    throw e;
   }
 }
 

src/library.cpp

@@ -202,7 +202,7 @@ std::string Library::getBestFromBookCollection(BookIdCollection books, const Boo
   }
 
   sort(books, DATE, false);
-  std::stable_sort(books.begin(), books.end(), [&](const std::string& bookId1, const std::string& bookId2) {
+  stable_sort(books.begin(), books.end(), [&](const std::string& bookId1, const std::string& bookId2) {
     const auto& book1 = getBookById(bookId1);
     const auto& book2 = getBookById(bookId2);
     bool same_flavour1 = book1.getFlavour() == bookmark.getBookFlavour();

src/manager.cpp

@@ -23,14 +23,6 @@
 #include "tools/pathTools.h"
 
 #include <pugixml.hpp>
-#include <filesystem>
-#include <iostream>
-#include <set>
-#include <queue>
-#include <cctype>
-#include <algorithm>
-
-namespace fs = std::filesystem;
 
 namespace kiwix
 {
@@ -259,58 +251,6 @@ bool Manager::addBookFromPath(const std::string& pathToOpen,
           .empty());
 }
 
-void Manager::addBooksFromDirectory(const std::string& path,
-                                    const bool verboseFlag)
-{
-  std::set<std::string> iteratedDirs;
-  std::queue<std::string> dirQueue;
-  dirQueue.push(fs::absolute(path).u8string());
-  int totalBooksAdded = 0;
-  if (verboseFlag)
-    std::cout << "Adding books from the directory tree: " << dirQueue.front() << std::endl;
-
-  while (!dirQueue.empty()) {
-    const auto currentPath = dirQueue.front();
-    dirQueue.pop();
-    if (verboseFlag)
-      std::cout << "Visiting directory: " << currentPath << std::endl;
-    for (const auto& dirEntry : fs::directory_iterator(currentPath)) {
-      auto resolvedPath = dirEntry.path();
-      if (fs::is_symlink(dirEntry)) {
-        try {
-          resolvedPath = fs::canonical(dirEntry.path());
-        } catch (const std::exception& e) {
-          std::cerr << "Could not resolve symlink " << resolvedPath.u8string() << " to a valid path. Skipping..." << std::endl;
-          continue;
-        }
-      }
-      const std::string pathString = resolvedPath.u8string();
-      std::string resolvedPathExtension = resolvedPath.extension().u8string();
-      std::transform(resolvedPathExtension.begin(), resolvedPathExtension.end(), resolvedPathExtension.begin(),
-          [](unsigned char c){ return std::tolower(c); });
-      if (fs::is_directory(resolvedPath)) {
-        if (iteratedDirs.find(pathString) == iteratedDirs.end())
-          dirQueue.push(pathString);
-        else if (verboseFlag)
-          std::cout << "Already iterated over " << pathString << ". Skipping..." << std::endl;
-      } else if (resolvedPathExtension == ".zim" || resolvedPathExtension == ".zimaa") {
-        if (!this->addBookFromPath(pathString, pathString, "", false)) {
-          std::cerr << "Could not add " << pathString << " into the library." << std::endl;
-        } else if (verboseFlag) {
-          std::cout << "Added " << pathString << " into the library." << std::endl;
-          totalBooksAdded++;
-        }
-      } else if (verboseFlag) {
-        std::cout << "Skipped " << pathString << " - unsupported file type or permission denied." << std::endl;
-      }
-    }
-    iteratedDirs.insert(currentPath);
-  }
-
-  if (verboseFlag)
-    std::cout << "Traversal completed. Total books added: " << totalBooksAdded << std::endl;
-}
-
 bool Manager::readBookFromPath(const std::string& path, kiwix::Book* book)
 {
   std::string tmp_path = path;

src/server/internalServer.cpp

@@ -85,10 +85,6 @@ namespace kiwix {
 namespace
 {
 
-void error(const std::string& msg) {
-  throw std::runtime_error(msg);
-}
-
 bool ipAvailable(const std::string addr)
 {
   auto interfaces = kiwix::getNetworkInterfacesIPv4Or6();
@@ -103,82 +99,14 @@ bool ipAvailable(const std::string addr)
   return false;
 }
 
-class InSockAddr
+std::string
+fullURL2LocalURL(const std::string& fullUrl, const std::string& rootLocation)
 {
-private: // data
-  struct sockaddr_in  v4 = {0};
-  struct sockaddr_in6 v6 = {0};
-
-public: // functions
-  explicit InSockAddr(int port)
-  {
-    v4.sin_family  = AF_INET;
-    v4.sin_port    = htons(port);
-    v6.sin6_family = AF_INET6;
-    v6.sin6_port   = htons(port);
+  if ( kiwix::startsWith(fullUrl, rootLocation) ) {
+    return fullUrl.substr(rootLocation.size());
+  } else {
+    return "INVALID URL";
   }
-
-  IpAddress setAnyAddress(IpMode ipMode)
-  {
-    v6.sin6_addr = in6addr_any;
-    v4.sin_addr.s_addr = htonl(INADDR_ANY);
-
-    IpAddress a = kiwix::getBestPublicIps();
-    if (ipMode == IpMode::IPV6) {
-      a.addr = "";
-    } else if (ipMode == IpMode::IPV4) {
-      a.addr6 = "";
-    }
-
-    return a;
-  }
-
-  IpMode setAddress(const IpAddress& a)
-  {
-    const std::string addrStr = !a.addr.empty() ? a.addr : a.addr6;
-
-    const int r1 = inet_pton(AF_INET,  a.addr.c_str(),  &v4.sin_addr.s_addr);
-    const int r2 = inet_pton(AF_INET6, a.addr6.c_str(), &v6.sin6_addr.s6_addr);
-
-    if ( r1 != 1 && r2 != 1 ) {
-      error("invalid IP address: " + addrStr);
-    }
-
-    if ( !ipAvailable(addrStr) ) {
-      error("IP address is not available on this system: " + addrStr);
-    }
-
-    return !a.addr.empty() ? IpMode::IPV4 : IpMode::IPV6;
-  }
-
-  struct sockaddr* sockaddr(IpMode ipMode) const
-  {
-    return (ipMode==IpMode::ALL || ipMode==IpMode::IPV6)
-         ? (struct sockaddr*)&v6
-         : (struct sockaddr*)&v4;
-  }
-
-};
-
-int getMHDFlags(IpMode ipMode, bool verbose)
-{
-#ifdef _WIN32
-  int flags = MHD_USE_SELECT_INTERNALLY;
-#else
-  int flags = MHD_USE_POLL_INTERNALLY;
-#endif
-
-  if (ipMode == IpMode::ALL) {
-    flags |= MHD_USE_DUAL_STACK;
-  } else if (ipMode == IpMode::IPV6) {
-    flags |= MHD_USE_IPv6;
-  }
-
-  if (verbose) {
-    flags |= MHD_USE_DEBUG;
-  }
-
-  return flags;
 }
 
 std::string getSearchComponent(const RequestContext& request)
@@ -418,6 +346,11 @@ SearchInfo InternalServer::getSearchInfo(const RequestContext& request) const
     geoQuery = GeoQuery(latitude, longitude, distance);
   } catch(const std::out_of_range&) {}
     catch(const std::invalid_argument&) {}
+
+  if (!geoQuery && pattern.empty()) {
+    throw Error(nonParameterizedMessage("no-query"));
+  }
+
   return SearchInfo(pattern, geoQuery, bookIds.second, bookIds.first);
 }
 
@@ -433,7 +366,7 @@ zim::Query SearchInfo::getZimQuery(bool verbose) const {
   if (verbose) {
     std::cout << "Performing query '" << pattern<< "'";
   }
-  query.setQuery(kiwix::trim(pattern));
+  query.setQuery(pattern);
   if (geoQuery) {
     if (verbose) {
       std::cout << " with geo query '" << geoQuery.distance << "&(" << geoQuery.latitude << ";" << geoQuery.longitude << ")'";
@@ -522,61 +455,81 @@ InternalServer::InternalServer(LibraryPtr library,
 
 InternalServer::~InternalServer() = default;
 
-struct MHD_Daemon* InternalServer::startMHD(int flags,
-                                            struct sockaddr* sockaddr)
-{
-  return MHD_start_daemon(flags,
-                          m_port,
-                          NULL,
-                          NULL,
-                          &staticHandlerCallback,
-                          this,
-                          MHD_OPTION_SOCK_ADDR, sockaddr,
-                          MHD_OPTION_THREAD_POOL_SIZE, m_nbThreads,
-                          MHD_OPTION_PER_IP_CONNECTION_LIMIT, m_ipConnectionLimit,
-                          MHD_OPTION_END);
-}
+bool InternalServer::start() {
+#ifdef _WIN32
+  int flags = MHD_USE_SELECT_INTERNALLY;
+#else
+  int flags = MHD_USE_POLL_INTERNALLY;
+#endif
+  if (m_verbose.load())
+    flags |= MHD_USE_DEBUG;
+
+
+  struct sockaddr_in sockAddr4={0};
+  sockAddr4.sin_family = AF_INET;
+  sockAddr4.sin_port = htons(m_port);
+  struct sockaddr_in6 sockAddr6={0};
+  sockAddr6.sin6_family = AF_INET6;
+  sockAddr6.sin6_port = htons(m_port);
 
-void InternalServer::startMHD() {
-  InSockAddr inSockAddr(m_port);
   if (m_addr.addr.empty() && m_addr.addr6.empty()) { // No ip address provided
     if (m_ipMode == IpMode::AUTO) m_ipMode = IpMode::ALL;
-    m_addr = inSockAddr.setAnyAddress(m_ipMode);
+    sockAddr6.sin6_addr = in6addr_any;
+    sockAddr4.sin_addr.s_addr = htonl(INADDR_ANY);
+    IpAddress bestIps = kiwix::getBestPublicIps();
+    if (m_ipMode == IpMode::IPV4 || m_ipMode == IpMode::ALL) m_addr.addr = bestIps.addr;
+    if (m_ipMode == IpMode::IPV6 || m_ipMode == IpMode::ALL) m_addr.addr6 = bestIps.addr6;
   } else {
+    const std::string addr = !m_addr.addr.empty() ? m_addr.addr : m_addr.addr6;
+
     if (m_ipMode != kiwix::IpMode::AUTO) {
-      error("When an IP address is provided the IP mode must not be set");
+      std::cerr << "ERROR: When an IP address is provided the IP mode must not be set" << std::endl;
+      return false;
     }
 
-    m_ipMode = inSockAddr.setAddress(m_addr);
+    bool validV4 = inet_pton(AF_INET, m_addr.addr.c_str(), &(sockAddr4.sin_addr.s_addr)) == 1;
+    bool validV6 = inet_pton(AF_INET6, m_addr.addr6.c_str(), &(sockAddr6.sin6_addr.s6_addr)) == 1;
+
+    if (!validV4 && !validV6) {
+      std::cerr << "ERROR: invalid IP address: " << addr << std::endl;
+      return false;
+    }
+
+    if (!ipAvailable(addr)) {
+      std::cerr << "ERROR: IP address is not available on this system: " << addr << std::endl;
+      return false;
+    }
+
+    m_ipMode = !m_addr.addr.empty() ? IpMode::IPV4 : IpMode::IPV6;
   }
 
-  const int flags = getMHDFlags(m_ipMode, m_verbose.load());
-  mp_daemon = startMHD(flags, inSockAddr.sockaddr(m_ipMode));
-  if (mp_daemon == nullptr && m_ipMode == IpMode::ALL) {
-    // MHD_USE_DUAL_STACK (set in IpMode::ALL case) fails on systems with IPv6
-    // disabled. Let's retry in IPv4-only mode.
-    m_ipMode = IpMode::IPV4;
-    m_addr.addr6 = "";
-    const int flags = getMHDFlags(m_ipMode, m_verbose.load());
-    mp_daemon = startMHD(flags, inSockAddr.sockaddr(m_ipMode));
+  if (m_ipMode == IpMode::ALL) {
+    flags|=MHD_USE_DUAL_STACK;
+  } else if (m_ipMode == IpMode::IPV6) {
+    flags|=MHD_USE_IPv6;
   }
 
+  struct sockaddr* sockaddr = (m_ipMode==IpMode::ALL || m_ipMode==IpMode::IPV6)
+                              ? (struct sockaddr*)&sockAddr6
+                              : (struct sockaddr*)&sockAddr4;
+
+  mp_daemon = MHD_start_daemon(flags,
+                            m_port,
+                            NULL,
+                            NULL,
+                            &staticHandlerCallback,
+                            this,
+                            MHD_OPTION_SOCK_ADDR, sockaddr,
+                            MHD_OPTION_THREAD_POOL_SIZE, m_nbThreads,
+                            MHD_OPTION_PER_IP_CONNECTION_LIMIT, m_ipConnectionLimit,
+                            MHD_OPTION_END);
   if (mp_daemon == nullptr) {
-    error("Unable to instantiate the HTTP daemon. "
-          "The port " + kiwix::to_string(m_port) + " is maybe already occupied"
-          " or need more permissions to be open. "
-          "Please try as root or with a port number higher or equal to 1024.");
-  }
-}
-
-bool InternalServer::start() {
-  try {
-    startMHD();
-  } catch (const std::runtime_error& err ) {
-    std::cerr << "ERROR: " << err.what() << std::endl;
+    std::cerr << "Unable to instantiate the HTTP daemon. The port " << m_port
+              << " is maybe already occupied or need more permissions to be open. "
+                 "Please try as root or with a port number higher or equal to 1024."
+              << std::endl;
     return false;
   }
-
   auto server_start_time = std::chrono::system_clock::now().time_since_epoch();
   m_server_id = kiwix::to_string(server_start_time.count());
   return true;
@@ -635,15 +588,11 @@ MHD_Result InternalServer::handlerCallback(struct MHD_Connection* connection,
     printf("full_url  : %s\n", fullUrl);
   }
 
+  const auto url = fullURL2LocalURL(fullUrl, m_rootPrefixOfDecodedURL);
   RequestContext::NameValuePairs headers, queryArgs;
   MHD_get_connection_values(connection, MHD_HEADER_KIND, add_name_value_pair, &headers);
   MHD_get_connection_values(connection, MHD_GET_ARGUMENT_KIND, add_name_value_pair, &queryArgs);
-
-  const int rootPrefixLen = kiwix::startsWith(fullUrl, m_rootPrefixOfDecodedURL)
-                          ? int(m_rootPrefixOfDecodedURL.size())
-                          : -1;
-
-  RequestContext request(fullUrl, rootPrefixLen, method, version, headers, queryArgs);
+  RequestContext request(m_root, url, method, version, headers, queryArgs);
 
   if (m_verbose.load() ) {
     request.print_debug_info();

src/server/internalServer.h

@@ -126,8 +126,6 @@ class InternalServer {
     IpMode getIpMode() const { return m_ipMode; }
 
   private: // functions
-    void startMHD();
-    struct MHD_Daemon* startMHD(int flags, struct sockaddr* sockaddr);
     std::unique_ptr<Response> handle_request(const RequestContext& request);
     std::unique_ptr<Response> build_redirect(const std::string& bookName, const zim::Item& item) const;
     std::unique_ptr<Response> build_homepage(const RequestContext& request);

src/server/request_context.cpp

@@ -51,14 +51,14 @@ RequestMethod str2RequestMethod(const std::string& method) {
 
 } // unnamed namespace
 
-RequestContext::RequestContext(const std::string& _fullUrl,   // URI-decoded
-                               int _rootPrefixLength,
+RequestContext::RequestContext(const std::string& _rootLocation, // URI-encoded
+                               const std::string& unrootedUrl,   // URI-decoded
                                const std::string& _method,
                                const std::string& version,
                                const NameValuePairs& headers,
                                const NameValuePairs& queryArgs) :
-  fullUrl(_fullUrl),
-  rootPrefixLength(_rootPrefixLength),
+  rootLocation(_rootLocation),
+  url(unrootedUrl),
   method(str2RequestMethod(_method)),
   version(version),
   requestIndex(s_requestIndex++),
@@ -128,8 +128,7 @@ void RequestContext::print_debug_info() const {
     printf("\n");
   }
   printf("Parsed : \n");
-  printf("full url: %s\n", fullUrl.c_str());
-  printf("derooted url: %s\n", get_url().c_str());
+  printf("url   : %s\n", url.c_str());
   printf("acceptEncodingGzip : %d\n", acceptEncodingGzip);
   printf("has_range : %d\n", byteRange_.kind() != ByteRange::NONE);
   printf("is_valid_url : %d\n", is_valid_url());
@@ -142,14 +141,11 @@ RequestMethod RequestContext::get_method() const {
 }
 
 std::string RequestContext::get_url() const {
-  return rootPrefixLength < 0
-       ? ""
-       : fullUrl.substr(rootPrefixLength);
+  return url;
 }
 
 std::string RequestContext::get_url_part(int number) const {
   size_t start = 1;
-  const std::string url = get_url();
   while(true) {
     auto found = url.find('/', start);
     if (number == 0) {
@@ -169,14 +165,14 @@ std::string RequestContext::get_url_part(int number) const {
 }
 
 std::string RequestContext::get_full_url() const {
-  return urlEncode(fullUrl);
+  return rootLocation + urlEncode(url);
+}
+
+std::string RequestContext::get_root_path() const {
+  return rootLocation.empty() ? "/" : rootLocation;
 }
 
 bool RequestContext::is_valid_url() const {
-  if ( rootPrefixLength < 0 )
-    return false;
-
-  const std::string url = get_url();
   return url.empty() || url[0] == '/';
 }
 

src/server/request_context.h

@@ -59,8 +59,8 @@ class RequestContext {
     typedef std::vector<std::pair<const char*, const char*>> NameValuePairs;
 
   public: // functions
-    RequestContext(const std::string& fullUrl,  // URI-decoded
-                   int rootPrefixLength,
+    RequestContext(const std::string& rootLocation, // URI-encoded
+                   const std::string& unrootedUrl,  // URI-decoded
                    const std::string& method,
                    const std::string& version,
                    const NameValuePairs& headers,
@@ -96,6 +96,7 @@ class RequestContext {
     std::string get_url() const;
     std::string get_url_part(int part) const;
     std::string get_full_url() const;
+    std::string get_root_path() const;
 
     std::string get_query() const { return queryString; }
 
@@ -138,8 +139,8 @@ class RequestContext {
     };
 
   private: // data
-    const std::string fullUrl; // URI-decoded
-    const int rootPrefixLength;
+    std::string rootLocation;
+    std::string url;
     RequestMethod method;
     std::string version;
     unsigned long long requestIndex;

src/server/response.cpp

@@ -520,7 +520,9 @@ HTTP500Response::HTTP500Response(const RequestContext& request,
 std::unique_ptr<Response> Response::build_416(size_t resourceLength)
 {
   auto response = Response::build();
-  response->set_code(MHD_HTTP_RANGE_NOT_SATISFIABLE);
+// [FIXME] (compile with recent enough version of libmicrohttpd)
+//  response->set_code(MHD_HTTP_RANGE_NOT_SATISFIABLE);
+  response->set_code(416);
   std::ostringstream oss;
   oss << "bytes */" << resourceLength;
   response->add_header(MHD_HTTP_HEADER_CONTENT_RANGE, oss.str());

src/spelling_correction.cpp

@@ -43,15 +43,11 @@ std::vector<std::string> getAllTitles(const zim::Archive& a)
 void createXapianDB(std::string path, const zim::Archive& archive)
 {
   const int flags = Xapian::DB_BACKEND_GLASS|Xapian::DB_CREATE;
-  const auto tmpDbPath = path + ".tmp";
-  Xapian::WritableDatabase db(tmpDbPath, flags);
+  Xapian::WritableDatabase db(path, flags);
   for (const auto& t : getAllTitles(archive)) {
     db.add_spelling(t);
   }
   db.commit();
-  db.compact(path, Xapian::DBCOMPACT_SINGLE_FILE);
-  db.close();
-  std::filesystem::remove_all(tmpDbPath);
 }
 
 std::string spellingsDBPathForZIMArchive(std::filesystem::path cacheDirPath, const zim::Archive& a)
@@ -59,24 +55,27 @@ std::string spellingsDBPathForZIMArchive(std::filesystem::path cacheDirPath, con
   // The version of spellings DB must be updated each time an important change
   // to the implementation is made that renders using the previous version
   // impossible or undesirable.
-  const char SPELLINGS_DB_VERSION[] = "0.1";
+  const char SPELLINGS_DB_VERSION[] = "0.2";
 
   std::ostringstream filename;
   filename << a.getUuid() << ".spellingsdb.v" << SPELLINGS_DB_VERSION;
   return (cacheDirPath / filename.str()).string();
 }
 
-std::unique_ptr<Xapian::Database> openOrCreateXapianDB(std::filesystem::path cacheDirPath, const zim::Archive& archive)
+std::unique_ptr<Xapian::WritableDatabase> openOrCreateXapianDB(std::filesystem::path cacheDirPath, const zim::Archive& archive)
 {
   const auto path = spellingsDBPathForZIMArchive(cacheDirPath, archive);
   try
   {
-    return std::make_unique<Xapian::Database>(path);
+    {
+      Xapian::Database checkIfDbAlreadyExists(path);
+    }
+    return std::make_unique<Xapian::WritableDatabase>(path);
   }
   catch (const Xapian::DatabaseOpeningError& )
   {
     createXapianDB(path, archive);
-    return std::make_unique<Xapian::Database>(path);
+    return std::make_unique<Xapian::WritableDatabase>(path);
   }
 }
 
@@ -93,15 +92,23 @@ SpellingsDB::~SpellingsDB()
 
 std::vector<std::string> SpellingsDB::getSpellingCorrections(const std::string& word, uint32_t maxCount) const
 {
-  if ( maxCount > 1 ) {
-    throw std::runtime_error("More than one spelling correction was requested");
+  std::vector<std::string> result;
+  while ( result.size() < maxCount ) {
+    const auto term = impl_->get_spelling_suggestion(word, 3);
+    if ( term.empty() )
+      break;
+
+    result.push_back(term);
+
+    // temporarily remove this term so that another spellings could be obtained
+    impl_->remove_spelling(term);
   }
 
-  std::vector<std::string> result;
-  const auto term = impl_->get_spelling_suggestion(word, 3);
-  if ( !term.empty() ) {
-    result.push_back(term);
+  // restore temporarily removed terms
+  for (const auto& t : result) {
+    impl_->add_spelling(t);
   }
+
   return result;
 }
 

src/tools/networkTools.cpp

@@ -117,10 +117,6 @@ std::map<std::string, IpAddress> getNetworkInterfacesWin() {
   // Successively allocate the required memory until GetAdaptersAddresses does not
   // results in ERROR_BUFFER_OVERFLOW for a maximum of max_tries
   do{
-    if (interfacesHead) {
-      free(interfacesHead);
-      interfacesHead = NULL;
-    }
     interfacesHead = (IP_ADAPTER_ADDRESSES *) malloc(outBufLen);
     if (interfacesHead == NULL) {
       std::cerr << "Memory allocation failed for IP_ADAPTER_ADDRESSES struct" << std::endl;
@@ -128,7 +124,6 @@ std::map<std::string, IpAddress> getNetworkInterfacesWin() {
     }
 
     dwRetVal = GetAdaptersAddresses(family, flags, NULL, interfacesHead, &outBufLen);
-    Iterations++;
   } while ((dwRetVal == ERROR_BUFFER_OVERFLOW) && (Iterations < max_tries));
 
   if (dwRetVal == NO_ERROR) {
@@ -235,7 +230,7 @@ IpAddress getBestPublicIps() {
     }
   }
 #endif
-  const char* const v4prefixes[] = { "192.168", "172.16", "10.211", "10.0" };
+  const char* const v4prefixes[] = { "192.168", "172.16", "10.0" };
   for (const auto& prefix : v4prefixes) {
     for (const auto& kv : interfaces) {
       const auto& interfaceIps = kv.second;

src/tools/stringTools.cpp

@@ -29,34 +29,11 @@
 #include <unicode/uniset.h>
 #include <unicode/ustring.h>
 
-#include <algorithm>
-#include <cctype>
+
 #include <iostream>
 #include <iomanip>
 #include <regex>
 
-namespace
-{
-
-bool isAsciiOnly(const std::string& s)
-{
-  for ( const unsigned char c : s ) {
-    if ( c >= 128 )
-      return false;
-  }
-  return true;
-}
-
-std::string asciiToLower(std::string s)
-{
-    std::transform(s.begin(), s.end(), s.begin(), [](unsigned char c) {
-        return ('A' <= c && c <= 'Z') ? c - ('Z' - 'z') : c;
-        });
-    return s;
-}
-
-} // unnamed namespace
-
 /* tell ICU where to find its dat file (tables) */
 void kiwix::loadICUExternalTables()
 {
@@ -93,16 +70,14 @@ std::string kiwix::ICULanguageInfo::selfName() const
 
 std::string kiwix::removeAccents(const std::string& text)
 {
-  if ( isAsciiOnly(text) )
-    return asciiToLower(text);
-
   loadICUExternalTables();
   ucnv_setDefaultName("UTF-8");
   UErrorCode status = U_ZERO_ERROR;
-  std::unique_ptr<icu::Transliterator> removeAccentsTrans(icu::Transliterator::createInstance(
-      "Lower; NFD; [:M:] remove; NFC", UTRANS_FORWARD, status));
+  auto removeAccentsTrans = icu::Transliterator::createInstance(
+      "Lower; NFD; [:M:] remove; NFC", UTRANS_FORWARD, status);
   icu::UnicodeString ustring(text.c_str());
   removeAccentsTrans->transliterate(ustring);
+  delete removeAccentsTrans;
   std::string unaccentedText;
   ustring.toUTF8String(unaccentedText);
   return unaccentedText;
@@ -473,13 +448,5 @@ std::string kiwix::getSlugifiedFileName(const std::string& filename)
 #else
   const std::regex reservedCharsReg("/");
 #endif
-  return std::regex_replace(filename, reservedCharsReg, "_");
-}
-
-std::string kiwix::trim(const std::string& s)
-{
-  auto is_space = [](unsigned char c) { return std::isspace(c); };
-  auto start = std::find_if_not(s.begin(), s.end(), is_space);
-  auto end = std::find_if_not(s.rbegin(), s.rend(), is_space).base();
-  return (start < end) ? std::string(start, end) : std::string();
+  return std::regex_replace(filename, reservedCharsReg, "_"); 
 }

src/tools/stringTools.h

@@ -60,8 +60,6 @@ std::string escapeForJSON(const std::string& s, bool escapeQuote = true);
 std::string urlEncode(const std::string& value);
 std::string urlDecode(const std::string& value, bool component = false);
 
-std::string trim(const std::string& s);
-
 std::string join(const std::vector<std::string>& list, const std::string& sep);
 
 std::string ucAll(const std::string& word);

static/skin/i18n/ia.json

@@ -10,7 +10,7 @@
 	"no-such-book": "Necun tal libro: {{BOOK_NAME}}",
 	"too-many-books": "Troppo de libros demandate ({{NB_BOOKS}}); le limite es {{LIMIT}}",
 	"no-book-found": "Necun libro corresponde al criterios de selection",
-	"url-not-found": "Le URL requestate “{{url}}” non ha essite trovate sur iste servitor.",
+	"url-not-found": "Le URL reuqestate \"{{url}}\" non ha essite trovate sur iste servitor.",
 	"suggest-search": "Facer un recerca in texto complete de <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
 	"random-article-failure": "Ups! Non poteva eliger un articulo aleatori :(",
 	"invalid-raw-data-type": "{{DATATYPE}} non es un requesta valide pro contento brute.",

static/skin/i18n/id.json

@@ -1,17 +1,15 @@
 {
 	"@metadata": {
 		"authors": [
-			"Akmaie Ajam",
-			"Bennylin",
-			"Penyuwangi"
+			"Akmaie Ajam"
 		]
 	},
 	"name": "Bahasa Inggris",
 	"suggest-full-text-search": "mengandung '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Tidak ada buku seperti ini: {{BOOK_NAME}}",
-	"too-many-books": "Terlalu banyak buku yang diminta ({{NB_BOOKS}}), batasnya adalah {{LIMIT}}",
+	"too-many-books": "Terlalu banyak buku yang diminta ({{NB_BOOKS}}) dimana batasnya adalah {{LIMIT}}",
 	"no-book-found": "Tidak ada buku yang sesuai kriteria yang dipilih",
-	"url-not-found": "URL yang diminta \"{{url}}\" tidak ditemukan di peladen ini.",
+	"url-not-found": "URL yang diminta \"{{url}}\" tidak ditemukan di server ini.",
 	"suggest-search": "Lakukan pencarian teks lengkap untuk <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
 	"random-article-failure": "Waduh! Gagal memilih artikel acak :(",
 	"invalid-raw-data-type": "{{DATATYPE}} bukan permintaan yang sah untuk konten mentah.",
@@ -23,9 +21,9 @@
 	"400-page-heading": "Permintaan tidak sah",
 	"404-page-title": "Konten tidak ditemukan",
 	"404-page-heading": "Tidak Ditemukan",
-	"500-page-title": "Galat Peladen Internal",
-	"500-page-heading": "Aduh. Halaman tidak bekerja.",
-	"500-page-text": "Jalur yang diminta tidak dapat diantar dengan benar:",
+	"500-page-title": "Kesalahan Server Internal",
+	"500-page-heading": "Kesalahan Server Internal",
+	"500-page-text": "Terjadi kesalahan server internal. Kami mohon maaf atas hal ini :/",
 	"fulltext-search-unavailable": "Pencarian teks lengkap tidak tersedia",
 	"no-search-results": "Mesin pencari teks lengkap tidak tersedia untuk konten ini.",
 	"search-results-page-title": "Pencarian: {{SEARCH_PATTERN}}",
@@ -54,10 +52,10 @@
 	"torrent-download-link-text": "BitTorrent",
 	"torrent-download-alt-text": "Unduh melalui BitTorrent",
 	"library-opds-feed-all-entries": "Umpan OPDS Perpustakaan - Semua entri",
-	"filter-by-tag": "Saring berdasarkan tanda \"{{{TAG}}}\"",
-	"stop-filtering-by-tag": "Hentikan penyaringan berdasarkan tanda \"{{{TAG}}}\"",
-	"library-opds-feed-parameterised": "Umpan OPDS Perpustakaan - entri yang cocok dengan {{#LANG}}\nBahasa: {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategori: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTanda: {{TAG}} {{/TAG}}{{#Q}}\nKueri: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Selamat datang di Peladen Kiwix",
+	"filter-by-tag": "Saring berdasarkan tag \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "Berhenti penyaringan berdasarkan tag \"{{{TAG}}}\"",
+	"library-opds-feed-parameterised": "Umpan OPDS Perpustakaan - entri yang cocok dengan {{#LANG}}\nBahasa: {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategori: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nKueri: {{Q}} {{/Q}}",
+	"welcome-to-kiwix-server": "Selamat datang di Server Kiwix",
 	"download-links-heading": "Tautan unduhan untuk <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Unduh buku",
 	"preview-book": "Pratayang",

static/skin/i18n/nl.json

@@ -67,7 +67,7 @@
 	"direct-download-alt-text": "Direct downloaden via HTTP(S)",
 	"hash-download-link-text": "SHA-256-controlesom",
 	"hash-download-alt-text": "De SHA-256-controlesom van het bestand weergeven",
-	"magnet-link-text": "Magnet-koppeling",
+	"magnet-link-text": "Magnet-link",
 	"magnet-alt-text": "Downloaden via Magnet-link",
 	"torrent-download-link-text": "BitTorrent",
 	"torrent-download-alt-text": "Downloaden via BitTorrent",

static/skin/i18n/ru.json

@@ -6,7 +6,6 @@
 			"Lutece398",
 			"Okras",
 			"Pacha Tchernof",
-			"Putnik",
 			"Razno0",
 			"Rofiatmustapha12",
 			"Smavrina"
@@ -60,7 +59,7 @@
 	"torrent-download-link-text": "BitTorrent",
 	"torrent-download-alt-text": "Скачать через BitTorrent",
 	"library-opds-feed-all-entries": "Канал библиотеки OPDS – все записи",
-	"filter-by-tag": "Фильтровать по тегу «{{{TAG}}}»",
+	"filter-by-tag": "Фильтровать по тегу \"{{{TAG}}}\"",
 	"stop-filtering-by-tag": "Прекратить фильтрацию по тегу \"{{{TAG}}}\"",
 	"library-opds-feed-parameterised": "Канал OPDS библиотеки – записи, соответствующие {{#LANG}}\nLanguage: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategory: {{CATEGORY}} {{/CATEGORY}} {{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nЗапрос: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Добро пожаловать на сервер Kiwix",

static/skin/index.js

@@ -36,7 +36,7 @@
                 filteredParams.set(key, value);
             }
         }
-        const feedLink = `${root}/catalog/v2/entries?count=-1&${filteredParams.toString()}`;
+        const feedLink = `${root}/catalog/v2/entries?${filteredParams.toString()}`;
         document.querySelector('#headFeedLink').href = feedLink;
         document.querySelector('#feedLink').href = feedLink;
         setFeedToolTip();

static/skin/languages.js

@@ -32,7 +32,7 @@ const uiLanguages = [
   {
     "iso_code": "el",
     "self_name": "Αγγλικά",
-    "translation_count": 27
+    "translation_count": 23
   },
   {
     "iso_code": "en",
@@ -41,13 +41,13 @@ const uiLanguages = [
   },
   {
     "iso_code": "es",
-    "self_name": "Español",
-    "translation_count": 92
+    "self_name": "español",
+    "translation_count": 67
   },
   {
     "iso_code": "fi",
     "self_name": "suomi",
-    "translation_count": 49
+    "translation_count": 29
   },
   {
     "iso_code": "fr",
@@ -117,12 +117,12 @@ const uiLanguages = [
   {
     "iso_code": "lb",
     "self_name": "Lëtzebuergesch",
-    "translation_count": 49
+    "translation_count": 48
   },
   {
     "iso_code": "mk",
     "self_name": "македонски",
-    "translation_count": 92
+    "translation_count": 81
   },
   {
     "iso_code": "ms",
@@ -137,7 +137,7 @@ const uiLanguages = [
   {
     "iso_code": "nl",
     "self_name": "Nederlands",
-    "translation_count": 84
+    "translation_count": 68
   },
   {
     "iso_code": "nqo",
@@ -192,7 +192,7 @@ const uiLanguages = [
   {
     "iso_code": "sl",
     "self_name": "slovenščina",
-    "translation_count": 84
+    "translation_count": 57
   },
   {
     "iso_code": "sq",
@@ -202,7 +202,7 @@ const uiLanguages = [
   {
     "iso_code": "sv",
     "self_name": "Svenska",
-    "translation_count": 84
+    "translation_count": 67
   },
   {
     "iso_code": "sw",
@@ -222,7 +222,7 @@ const uiLanguages = [
   {
     "iso_code": "zh-hans",
     "self_name": "简体中文",
-    "translation_count": 84
+    "translation_count": 68
   },
   {
     "iso_code": "zh-hant",

static/skin/viewer.js

@@ -83,7 +83,6 @@ function quasiUriEncode(s, specialSymbols) {
 
 function performSearch() {
   const searchbox = document.getElementById('kiwixsearchbox');
-  if (!searchbox.value.trim()) { return;}
   const q = encodeURIComponent(searchbox.value);
   gotoUrl(`/search?books.name=${currentBook}&pattern=${q}&userlang=${viewerState.uiLanguage}`);
 }
@@ -228,6 +227,12 @@ function updateToolbarVisibilityState() {
   previousScrollTop = st;
 }
 
+function handle_visual_viewport_change() {
+  const wh = window.visualViewport
+           ? window.visualViewport.height
+           : window.innerHeight;
+  contentIframe.height = wh - contentIframe.offsetTop - 4;
+}
 
 function setIframeUrl(path) {
   try {
@@ -577,7 +582,9 @@ function setupViewer() {
   // Defer the call of handle_visual_viewport_change() until after the
   // presence or absence of the taskbar as determined by this function
   // has been settled.
+  setTimeout(handle_visual_viewport_change, 0);
 
+  window.onresize = handle_visual_viewport_change;
 
   const kiwixToolBarWrapper = document.getElementById('kiwixtoolbarwrapper');
   if ( ! viewerSettings.toolbarEnabled ) {

static/templates/index.html

@@ -20,7 +20,7 @@
       type="application/atom+xml"
       title="Library OPDS Feed"
       id="headFeedLink"
-      href="{{root}}/catalog/v2/entries?count=-1"
+      href="{{root}}/catalog/v2/entries"
     />
     <link rel="search" type="application/opensearchdescription+xml" href="{{root}}/catalog/searchdescription.xml" />
     <link rel="apple-touch-icon" sizes="180x180" href="{{root}}/skin/favicon/apple-touch-icon.png?KIWIXCACHEID">
@@ -64,7 +64,7 @@
       </div>
     </noscript>
     <div class='kiwixNav'>
-      <a href="{{root}}/catalog/v2/entries?count=-1" id="feedLink">
+      <a href="{{root}}/catalog/v2/entries" id="feedLink">
         <img src="{{root}}/skin/feed.svg?KIWIXCACHEID"
              class="feedLogo"
              id="feedLogo"

static/viewer.html

@@ -7,16 +7,6 @@
                    frame-src 'self';
                    object-src 'none';">
     <title>ZIM Viewer</title>
-    <style>
-      html {
-        height: 100%;
-      }
-      html, body, #content_iframe {
-        display: flex;
-        flex-direction: column;
-        flex: 1;
-      }
-    </style>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link type="text/css" href="./skin/kiwix.css?KIWIXCACHEID" rel="Stylesheet" />
     <link type="text/css" href="./skin/taskbar.css?KIWIXCACHEID" rel="Stylesheet" />

test/name_mapper.cpp

@@ -2,9 +2,6 @@
 
 #include "../include/library.h"
 #include "../include/manager.h"
-#include "testing_tools.h"
-using namespace kiwix::testing;
-
 #include "gtest/gtest.h"
 
 namespace
@@ -61,6 +58,27 @@ class NameMapperTest : public ::testing::Test {
   std::shared_ptr<kiwix::Library> lib;
 };
 
+class CapturedStderr
+{
+  std::ostringstream buffer;
+  std::streambuf* const sbuf;
+public:
+  CapturedStderr()
+    : sbuf(std::cerr.rdbuf())
+  {
+    std::cerr.rdbuf(buffer.rdbuf());
+  }
+
+  CapturedStderr(const CapturedStderr&) = delete;
+
+  ~CapturedStderr()
+  {
+    std::cerr.rdbuf(sbuf);
+  }
+
+  operator std::string() const { return buffer.str(); }
+};
+
 #if _WIN32
 const std::string ZERO_FOUR_NAME_CONFLICT_MSG =
     "Path collision: 'C:\\data\\zero_four_2021-10.zim' and"

test/response.cpp

@@ -12,7 +12,7 @@ RequestContext makeHttpGetRequest(const std::string& url,
                                   const RequestContext::NameValuePairs& headers,
                                   const RequestContext::NameValuePairs& queryArgs)
 {
-  return RequestContext(url, 0, "GET", "1.1", headers, queryArgs);
+  return RequestContext("", url, "GET", "1.1", headers, queryArgs);
 }
 
 std::string getResponseContent(const ContentResponseBlueprint& crb)

test/server.cpp

@@ -8,11 +8,6 @@
 
 #include "../src/tools/stringTools.h"
 
-#include "testing_tools.h"
-
-#include "../src/server/microhttpd_wrapper.h" // for MHD_VERSION
-
-using namespace kiwix::testing;
 
 const std::string ROOT_PREFIX("/ROOT%23%3F");
 
@@ -70,7 +65,7 @@ const ResourceCollection resources200Compressible{
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.css?cacheid=ae79e41a" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.js" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.js?cacheid=e3305ca0" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/index.js?cacheid=4e232c58" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/iso6391To3.js" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/isotope.pkgd.min.js" },
@@ -82,7 +77,7 @@ const ResourceCollection resources200Compressible{
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/taskbar.css" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/taskbar.css?cacheid=42e90cb9" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/viewer.js" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/viewer.js?cacheid=f78c03d9" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/viewer.js?cacheid=00e0fdf3" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/fonts/Poppins.ttf" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/fonts/Poppins.ttf?cacheid=af705837" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/fonts/Roboto.ttf" },
@@ -91,7 +86,7 @@ const ResourceCollection resources200Compressible{
   // TODO: implement cache management of i18n resources
   //{ STATIC_CONTENT, "/ROOT%23%3F/skin/i18n/test.json?cacheid=unknown" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/languages.js" },
-  { STATIC_CONTENT, "/ROOT%23%3F/skin/languages.js?cacheid=d2d6933b" },
+  { STATIC_CONTENT, "/ROOT%23%3F/skin/languages.js?cacheid=08955948" },
 
   { DYNAMIC_CONTENT, "/ROOT%23%3F/catalog/search" },
 
@@ -306,10 +301,10 @@ R"EXPECTEDRESULT(      href="/ROOT%23%3F/skin/kiwix.css?cacheid=b4e29e64"
     <meta name="msapplication-config" content="/ROOT%23%3F/skin/favicon/browserconfig.xml?cacheid=f29a7c4a">
     <script type="text/javascript" src="./skin/polyfills.js?cacheid=a0e0343d"></script>
     <script type="module" src="/ROOT%23%3F/skin/i18n.js?cacheid=e9a10ac1" defer></script>
-    <script type="text/javascript" src="/ROOT%23%3F/skin/languages.js?cacheid=d2d6933b" defer></script>
+    <script type="text/javascript" src="/ROOT%23%3F/skin/languages.js?cacheid=08955948" defer></script>
     <script src="/ROOT%23%3F/skin/isotope.pkgd.min.js?cacheid=2e48d392" defer></script>
     <script src="/ROOT%23%3F/skin/iso6391To3.js?cacheid=ecde2bb3"></script>
-    <script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=e3305ca0" defer></script>
+    <script type="text/javascript" src="/ROOT%23%3F/skin/index.js?cacheid=4e232c58" defer></script>
         <img src="/ROOT%23%3F/skin/feed.svg?cacheid=055b333f"
         <img src="/ROOT%23%3F/skin/langSelector.svg?cacheid=00b59961"
 )EXPECTEDRESULT"
@@ -342,8 +337,8 @@ R"EXPECTEDRESULT(    <link type="text/css" href="./skin/kiwix.css?cacheid=b4e29e
     <link type="text/css" href="./skin/print.css?cacheid=65b1c1d2" media="print" rel="Stylesheet" />
     <script type="text/javascript" src="./skin/polyfills.js?cacheid=a0e0343d"></script>
     <script type="module" src="./skin/i18n.js?cacheid=e9a10ac1" defer></script>
-    <script type="text/javascript" src="./skin/languages.js?cacheid=d2d6933b" defer></script>
-    <script type="text/javascript" src="./skin/viewer.js?cacheid=f78c03d9" defer></script>
+    <script type="text/javascript" src="./skin/languages.js?cacheid=08955948" defer></script>
+    <script type="text/javascript" src="./skin/viewer.js?cacheid=00e0fdf3" defer></script>
     <script type="text/javascript" src="./skin/autoComplete/autoComplete.min.js?cacheid=1191aaaf"></script>
       const blankPageUrl = root + "/skin/blank.html?cacheid=6b1fa032";
           <label for="kiwix_button_show_toggle"><img src="./skin/caret.png?cacheid=22b942b4" alt=""></label>
@@ -442,11 +437,8 @@ TEST_F(ServerTest, CacheIdsOfStaticResourcesMatchTheSha1HashOfResourceContent)
 }
 
 const char* urls400[] = {
-#if MHD_VERSION >= 0x01000300
-  "/ROOT%23%",
-  "/ROOT%23%3",
-#endif // MHD_VERSION
   "/ROOT%23%3F/search",
+  "/ROOT%23%3F/search?content=zimfile",
   "/ROOT%23%3F/search?content=non-existing-book&pattern=asdfqwerty",
   "/ROOT%23%3F/search?content=non-existing-book&pattern=asd<qwerty",
   "/ROOT%23%3F/search?books.name=non-exsitent-book&pattern=asd<qwerty",
@@ -468,10 +460,8 @@ const char* urls404[] = {
   "/",
   "/zimfile",
   "/ROOT",
-#if MHD_VERSION < 0x01000300
   "/ROOT%23%",
   "/ROOT%23%3",
-#endif // MHD_VERSION
   "/ROOT%23%3Fxyz",
   "/ROOT%23%3F/skin/non-existent-skin-resource",
   "/ROOT%23%3F/skin/autoComplete/autoComplete.min.js?cacheid=wrongcacheid",
@@ -788,47 +778,6 @@ TEST_F(ServerTest, Http404HtmlError)
 {
   using namespace TestingOfHtmlResponses;
   const std::vector<TestContentIn404HtmlResponse> testData{
-
-    // wrong root URL (root URL missing completely)
-    { /* url */ "/",
-      expected_kiwix_response_data==R"({ "CSS_URL" : false, "PAGE_HEADING" : { "msgid" : "404-page-heading", "params" : { } }, "PAGE_TITLE" : { "msgid" : "404-page-title", "params" : { } }, "details" : [ { "p" : { "msgid" : "url-not-found", "params" : { "url" : "/" } } } ] })" &&
-      expected_body==R"(
-    <h1>Not Found</h1>
-    <p>
-      The requested URL "/" was not found on this server.
-    </p>
-)"  },
-
-    // (conspicuously) wrong root URL
-    { /* url */ "/WRONGROOT",
-      expected_kiwix_response_data==R"({ "CSS_URL" : false, "PAGE_HEADING" : { "msgid" : "404-page-heading", "params" : { } }, "PAGE_TITLE" : { "msgid" : "404-page-title", "params" : { } }, "details" : [ { "p" : { "msgid" : "url-not-found", "params" : { "url" : "/WRONGROOT" } } } ] })" &&
-      expected_body==R"(
-    <h1>Not Found</h1>
-    <p>
-      The requested URL "/WRONGROOT" was not found on this server.
-    </p>
-)"  },
-
-    // wrong root URL with the correct root URL appearing as a suffix
-    { /* url */ "/WRONGROOT/ROOT%23%3F",
-      expected_kiwix_response_data==R"({ "CSS_URL" : false, "PAGE_HEADING" : { "msgid" : "404-page-heading", "params" : { } }, "PAGE_TITLE" : { "msgid" : "404-page-title", "params" : { } }, "details" : [ { "p" : { "msgid" : "url-not-found", "params" : { "url" : "/WRONGROOT/ROOT%23%3F" } } } ] })" &&
-      expected_body==R"(
-    <h1>Not Found</h1>
-    <p>
-      The requested URL "/WRONGROOT/ROOT%23%3F" was not found on this server.
-    </p>
-)"  },
-
-    // wrong root URL (with the correct root URL appearing as a prefix)
-    { /* url */ "/ROOT%23%3FWRONGROOT",
-      expected_kiwix_response_data==R"({ "CSS_URL" : false, "PAGE_HEADING" : { "msgid" : "404-page-heading", "params" : { } }, "PAGE_TITLE" : { "msgid" : "404-page-title", "params" : { } }, "details" : [ { "p" : { "msgid" : "url-not-found", "params" : { "url" : "/ROOT%23%3FWRONGROOT" } } } ] })" &&
-      expected_body==R"(
-    <h1>Not Found</h1>
-    <p>
-      The requested URL "/ROOT%23%3FWRONGROOT" was not found on this server.
-    </p>
-)"  },
-
     { /* url */ "/ROOT%23%3F/random?content=non-existent-book",
       expected_kiwix_response_data==R"({ "CSS_URL" : false, "PAGE_HEADING" : { "msgid" : "404-page-heading", "params" : { } }, "PAGE_TITLE" : { "msgid" : "404-page-title", "params" : { } }, "details" : [ { "p" : { "msgid" : "no-such-book", "params" : { "BOOK_NAME" : "non-existent-book" } } } ] })" &&
       expected_body==R"(
@@ -1103,6 +1052,17 @@ TEST_F(ServerTest, Http400HtmlError)
     <p>
       Too many books requested (4) where limit is 3
     </p>
+)"  },
+    { /* url */ "/ROOT%23%3F/search?content=zimfile",
+      expected_kiwix_response_data==R"({ "CSS_URL" : false, "PAGE_HEADING" : { "msgid" : "400-page-heading", "params" : { } }, "PAGE_TITLE" : { "msgid" : "400-page-title", "params" : { } }, "details" : [ { "p" : { "msgid" : "invalid-request", "params" : { "url" : "/ROOT%23%3F/search?content=zimfile" } } }, { "p" : { "msgid" : "no-query", "params" : { } } } ] })" &&
+      expected_body==R"(
+    <h1>Invalid request</h1>
+    <p>
+      The requested URL "/ROOT%23%3F/search?content=zimfile" is not a valid request.
+    </p>
+    <p>
+      No query provided.
+    </p>
 )"  },
     { /* url */ "/ROOT%23%3F/search?content=non-existing-book&pattern=asdfqwerty",
       expected_kiwix_response_data==R"({ "CSS_URL" : false, "PAGE_HEADING" : { "msgid" : "400-page-heading", "params" : { } }, "PAGE_TITLE" : { "msgid" : "400-page-title", "params" : { } }, "details" : [ { "p" : { "msgid" : "invalid-request", "params" : { "url" : "/ROOT%23%3F/search?content=non-existing-book&pattern=asdfqwerty" } } }, { "p" : { "msgid" : "no-such-book", "params" : { "BOOK_NAME" : "non-existing-book" } } } ] })" &&
@@ -1125,6 +1085,19 @@ TEST_F(ServerTest, Http400HtmlError)
     <p>
       No such book: non-existing-book
     </p>
+)"  },
+    // There is a flaw in our way to handle query string, we cannot differenciate
+    // between `pattern` and `pattern=`
+    { /* url */ "/ROOT%23%3F/search?books.filter.lang=eng&pattern",
+      expected_kiwix_response_data==R"({ "CSS_URL" : false, "PAGE_HEADING" : { "msgid" : "400-page-heading", "params" : { } }, "PAGE_TITLE" : { "msgid" : "400-page-title", "params" : { } }, "details" : [ { "p" : { "msgid" : "invalid-request", "params" : { "url" : "/ROOT%23%3F/search?books.filter.lang=eng&pattern" } } }, { "p" : { "msgid" : "no-query", "params" : { } } } ] })" &&
+      expected_body==R"(
+    <h1>Invalid request</h1>
+    <p>
+      The requested URL "/ROOT%23%3F/search?books.filter.lang=eng&pattern" is not a valid request.
+    </p>
+    <p>
+      No query provided.
+    </p>
 )"  },
     { /* url */ "/ROOT%23%3F/search?pattern=foo",
       expected_kiwix_response_data==R"({ "CSS_URL" : false, "PAGE_HEADING" : { "msgid" : "400-page-heading", "params" : { } }, "PAGE_TITLE" : { "msgid" : "400-page-title", "params" : { } }, "details" : [ { "p" : { "msgid" : "invalid-request", "params" : { "url" : "/ROOT%23%3F/search?pattern=foo" } } }, { "p" : { "msgid" : "too-many-books", "params" : { "LIMIT" : "3", "NB_BOOKS" : "4" } } } ] })" &&
@@ -1137,6 +1110,20 @@ TEST_F(ServerTest, Http400HtmlError)
       Too many books requested (4) where limit is 3
     </p>
 )"  },
+
+    // Testing of translation
+    { /* url */ "/ROOT%23%3F/search?content=zimfile&userlang=test",
+      expected_page_title=="[I18N TESTING] Invalid request ($400 fine must be paid)" &&
+      expected_kiwix_response_data==R"({ "CSS_URL" : false, "PAGE_HEADING" : { "msgid" : "400-page-heading", "params" : { } }, "PAGE_TITLE" : { "msgid" : "400-page-title", "params" : { } }, "details" : [ { "p" : { "msgid" : "invalid-request", "params" : { "url" : "/ROOT%23%3F/search?content=zimfile&userlang=test" } } }, { "p" : { "msgid" : "no-query", "params" : { } } } ] })" &&
+      expected_body==R"(
+    <h1>[I18N TESTING] -400 karma for an invalid request</h1>
+    <p>
+      [I18N TESTING] Invalid URL: "/ROOT%23%3F/search?content=zimfile&userlang=test"
+    </p>
+    <p>
+      [I18N TESTING] Kiwix can read your thoughts but it is against GDPR. Please provide your query explicitly.
+    </p>
+)"  },
   };
 
   for ( const auto& t : testData ) {
@@ -1167,6 +1154,20 @@ TEST_F(ServerTest, HttpXmlError)
   };
 
   const std::vector<TestData> testData{
+    { /* url */ "/ROOT%23%3F/search?format=xml",
+      /* HTTP status code */ 400,
+      /* expected response XML */ R"(
+<error>Invalid request</error>
+<detail>The requested URL "/ROOT%23%3F/search?format=xml" is not a valid request.</detail>
+<detail>Too many books requested (4) where limit is 3</detail>
+)"  },
+    { /* url */ "/ROOT%23%3F/search?format=xml&content=zimfile",
+      /* HTTP status code */ 400,
+      /* expected response XML */ R"(
+<error>Invalid request</error>
+<detail>The requested URL "/ROOT%23%3F/search?format=xml&content=zimfile" is not a valid request.</detail>
+<detail>No query provided.</detail>
+)"  },
     { /* url */ "/ROOT%23%3F/search?format=xml&content=non-existing-book&pattern=asdfqwerty",
       /* HTTP status code */ 400,
       /* expected response XML */ R"(
@@ -1180,6 +1181,15 @@ TEST_F(ServerTest, HttpXmlError)
 <error>Invalid request</error>
 <detail>The requested URL "/ROOT%23%3F/search?format=xml&content=non-existing-book&pattern=a%22%3Cscript%20foo%3E" is not a valid request.</detail>
 <detail>No such book: non-existing-book</detail>
+)"  },
+    // There is a flaw in our way to handle query string, we cannot differenciate
+    // between `pattern` and `pattern=`
+    { /* url */ "/ROOT%23%3F/search?format=xml&books.filter.lang=eng&pattern",
+      /* HTTP status code */ 400,
+      /* expected response XML */ R"(
+<error>Invalid request</error>
+<detail>The requested URL "/ROOT%23%3F/search?format=xml&books.filter.lang=eng&pattern" is not a valid request.</detail>
+<detail>No query provided.</detail>
 )"  },
     { /* url */ "/ROOT%23%3F/search?format=xml&pattern=foo",
       /* HTTP status code */ 400,
@@ -1336,7 +1346,7 @@ R"EXPECTEDRESPONSE(const uiLanguages = [
   {
     "iso_code": "el",
     "self_name": "Αγγλικά",
-    "translation_count": 27
+    "translation_count": 23
   },
   {
     "iso_code": "en",
@@ -1345,13 +1355,13 @@ R"EXPECTEDRESPONSE(const uiLanguages = [
   },
   {
     "iso_code": "es",
-    "self_name": "Español",
-    "translation_count": 92
+    "self_name": "español",
+    "translation_count": 67
   },
   {
     "iso_code": "fi",
     "self_name": "suomi",
-    "translation_count": 49
+    "translation_count": 29
   },
   {
     "iso_code": "fr",
@@ -1421,12 +1431,12 @@ R"EXPECTEDRESPONSE(const uiLanguages = [
   {
     "iso_code": "lb",
     "self_name": "Lëtzebuergesch",
-    "translation_count": 49
+    "translation_count": 48
   },
   {
     "iso_code": "mk",
     "self_name": "македонски",
-    "translation_count": 92
+    "translation_count": 81
   },
   {
     "iso_code": "ms",
@@ -1441,7 +1451,7 @@ R"EXPECTEDRESPONSE(const uiLanguages = [
   {
     "iso_code": "nl",
     "self_name": "Nederlands",
-    "translation_count": 84
+    "translation_count": 68
   },
   {
     "iso_code": "nqo",
@@ -1496,7 +1506,7 @@ R"EXPECTEDRESPONSE(const uiLanguages = [
   {
     "iso_code": "sl",
     "self_name": "slovenščina",
-    "translation_count": 84
+    "translation_count": 57
   },
   {
     "iso_code": "sq",
@@ -1506,7 +1516,7 @@ R"EXPECTEDRESPONSE(const uiLanguages = [
   {
     "iso_code": "sv",
     "self_name": "Svenska",
-    "translation_count": 84
+    "translation_count": 67
   },
   {
     "iso_code": "sw",
@@ -1526,7 +1536,7 @@ R"EXPECTEDRESPONSE(const uiLanguages = [
   {
     "iso_code": "zh-hans",
     "self_name": "简体中文",
-    "translation_count": 84
+    "translation_count": 68
   },
   {
     "iso_code": "zh-hant",
@@ -2353,79 +2363,3 @@ R"(const viewerSettings = {
 )");
   }
 }
-
-TEST_F(ServerTest, EmptyPatternSearchDoesNotError)
-{
-  EXPECT_EQ(200, zfs1_->GET("/ROOT%23%3F/search?content=zimfile")->status);
-}
-
-#define EXPECT_ERROR(MSG, SERVER_SETUP_CODE) \
-  { \
-    kiwix::Server server(kiwix::Library::create()); \
-    CapturedStderr stderror; \
-    SERVER_SETUP_CODE; \
-    EXPECT_FALSE(server.start()); \
-    EXPECT_EQ(std::string(stderror), std::string("ERROR: ") + MSG + "\n"); \
-  }
-
-TEST(ServerNegativeTest, IpAddressAndIpModeAreMutuallyExclusive)
-{
-  EXPECT_ERROR("When an IP address is provided the IP mode must not be set",
-    server.setAddress("127.0.0.1");
-    server.setIpMode(kiwix::IpMode::IPV4);
-  );
-
-  EXPECT_ERROR("When an IP address is provided the IP mode must not be set",
-    server.setAddress("[::1]");
-    server.setIpMode(kiwix::IpMode::IPV6);
-  );
-
-  EXPECT_ERROR("When an IP address is provided the IP mode must not be set",
-    server.setAddress("localhost");
-    server.setIpMode(kiwix::IpMode::ALL);
-  );
-}
-
-TEST(ServerNegativeTest, InvalidIpAddressDetection)
-{
-  EXPECT_ERROR("invalid IP address: 1.2.3",
-    server.setAddress("1.2.3");
-  );
-
-  EXPECT_ERROR("invalid IP address: 127.0.0.256",
-    server.setAddress("127.0.0.256");
-  );
-
-  EXPECT_ERROR("invalid IP address: localhost",
-    server.setAddress("localhost");
-  );
-
-  EXPECT_ERROR("invalid IP address: fe80::94d2:16e7:5f3e:89bx",
-    server.setAddress("[fe80::94d2:16e7:5f3e:89bx]");
-  );
-
-  // We assume that our unit tests won't be run on Google's DNS server
-  EXPECT_ERROR("IP address is not available on this system: 8.8.8.8",
-    server.setAddress("8.8.8.8");
-  );
-
-  // According to the spec, IPv6 addresses 2001:db8::/32 are reserved
-  // for documentation and example source code
-  EXPECT_ERROR("IP address is not available on this system: 2001:db8::",
-    server.setAddress("[2001:db8::]");
-  );
-}
-
-TEST(ServerNegativeTest, UnusablePort)
-{
-  // Occupy port 8910
-  httplib::Server portOccupant;
-  ASSERT_TRUE(portOccupant.bind_to_port("127.0.0.1", 8910));
-
-  // Try to listen on the same port
-  EXPECT_ERROR("Unable to instantiate the HTTP daemon. The port 8910 is maybe "
-               "already occupied or need more permissions to be open. Please "
-               "try as root or with a port number higher or equal to 1024.",
-    server.setPort(8910);
-  );
-}

test/server_search.cpp

@@ -689,24 +689,6 @@ bool isSubSnippet(std::string subSnippet, const std::string& superSnippet)
 #define  RAYCHARLESZIMID "6f1d19d0-633f-087b-fb55-7ac324ff9baf"
 #define  EXAMPLEZIMID    "5dc0b3af-5df2-0925-f0ca-d2bf75e78af6"
 
-const std::vector<SearchResult> YELLOW_SEARCH_RESULTS = {
-  SEARCH_RESULT(
-    /*link*/        "/ROOT%23%3F/content/zimfile/A/Eleanor_Rigby",
-    /*title*/       "Eleanor Rigby",
-    /*snippet*/     R"SNIPPET(...-side "<b>Yellow</b> Submarine" (double A-side) Released 5)SNIPPET" "\xC2\xA0" "August" "\xC2\xA0" "1966" "\xC2\xA0" R"SNIPPET((1966-08-05) Format 7-inch single Recorded 28–29 April &amp; 6 June 1966 Studio EMI, London Genre Baroque pop, art rock Length 2:08 Label Parlophone (UK), Capitol (US) Songwriter(s) Lennon–McCartney Producer(s) George Martin The Beatles singles chronology "Paperback Writer" (1966) "Eleanor Rigby" / "<b>Yellow</b> Submarine" (1966) "Strawberry Fields Forever" / "Penny Lane" (1967) Music video "Eleanor Rigby" on YouTube The song continued the......)SNIPPET",
-    /*bookTitle*/  "Ray Charles",
-    /*wordCount*/  "201"
-  ),
-
-  SEARCH_RESULT(
-    /*link*/        "/ROOT%23%3F/content/zimfile/A/If_You_Go_Away",
-    /*title*/       "If You Go Away",
-    /*snippet*/     R"SNIPPET(...standard and has been recorded by many artists, including Greta Keller, for whom some say McKuen wrote the lyrics. "If You Go Away" Single by Damita Jo from the album If You Go Away B-side "<b>Yellow</b> Days" Released 1966 Genre Jazz Length 3:49 Label Epic Records Songwriter(s) Jacques Brel, Rod McKuen Producer(s) Bob Morgan Damita Jo singles chronology "Gotta Travel On" (1965) "If You Go Away" (1966) "Walk Away" (1967) Damita Jo reached #10 on the Adult Contemporary chart and #68 on the Billboard Hot 100 in 1966 for her version of the song. Terry Jacks recorded a version of the song which was released as a single in 1974 and reached #29 on the Adult Contemporary chart, #68 on the......)SNIPPET",
-    /*bookTitle*/  "Ray Charles",
-    /*wordCount*/  "204"
-  )
-};
-
 struct TestData
 {
   struct PaginationEntry
@@ -953,26 +935,6 @@ struct TestData
 TEST(ServerSearchTest, searchResults)
 {
   const TestData testData[] = {
-    {
-      /* query */          "pattern=&books.id=" RAYCHARLESZIMID,
-      /* start */            -1,
-      /* resultsPerPage */   0,
-      /* totalResultCount */ 0,
-      /* firstResultIndex */ 0,
-      /* results */          {},
-      /* pagination */       {}
-    },
-
-    {
-      /* query */           "pattern=%20&books.id=" RAYCHARLESZIMID,
-      /* start */            -1,
-      /* resultsPerPage */   0,
-      /* totalResultCount */ 0,
-      /* firstResultIndex */ 0,
-      /* results */          {},
-      /* pagination */       {}
-    },
-
     {
       /* query */          "pattern=velomanyunkan&books.id=" RAYCHARLESZIMID,
       /* start */            -1,
@@ -1018,8 +980,24 @@ TEST(ServerSearchTest, searchResults)
       /* resultsPerPage */   0,
       /* totalResultCount */ 2,
       /* firstResultIndex */ 0,
-      /* results */          YELLOW_SEARCH_RESULTS,
-      /* pagination */       {}
+      /* results */ {
+        SEARCH_RESULT(
+          /*link*/       "/ROOT%23%3F/content/zimfile/A/Eleanor_Rigby",
+          /*title*/      "Eleanor Rigby",
+          /*snippet*/    R"SNIPPET(...-side "<b>Yellow</b> Submarine" (double A-side) Released 5 August 1966 (1966-08-05) Format 7-inch single Recorded 28–29 April &amp; 6 June 1966 Studio EMI, London Genre Baroque pop, art rock Length 2:08 Label Parlophone (UK), Capitol (US) Songwriter(s) Lennon–McCartney Producer(s) George Martin The Beatles singles chronology "Paperback Writer" (1966) "Eleanor Rigby" / "<b>Yellow</b> Submarine" (1966) "Strawberry Fields Forever" / "Penny Lane" (1967) Music video "Eleanor Rigby" on YouTube The song continued the......)SNIPPET",
+          /*bookTitle*/  "Ray Charles",
+          /*wordCount*/  "201"
+        ),
+
+        SEARCH_RESULT(
+          /*link*/       "/ROOT%23%3F/content/zimfile/A/If_You_Go_Away",
+          /*title*/      "If You Go Away",
+          /*snippet*/    R"SNIPPET(...standard and has been recorded by many artists, including Greta Keller, for whom some say McKuen wrote the lyrics. "If You Go Away" Single by Damita Jo from the album If You Go Away B-side "<b>Yellow</b> Days" Released 1966 Genre Jazz Length 3:49 Label Epic Records Songwriter(s) Jacques Brel, Rod McKuen Producer(s) Bob Morgan Damita Jo singles chronology "Gotta Travel On" (1965) "If You Go Away" (1966) "Walk Away" (1967) Damita Jo reached #10 on the Adult Contemporary chart and #68 on the Billboard Hot 100 in 1966 for her version of the song. Terry Jacks recorded a version of the song which was released as a single in 1974 and reached #29 on the Adult Contemporary chart, #68 on the......)SNIPPET",
+          /*bookTitle*/  "Ray Charles",
+          /*wordCount*/  "204"
+        )
+      },
+      /* pagination */ {}
     },
 
     {
@@ -1028,28 +1006,50 @@ TEST(ServerSearchTest, searchResults)
       /* resultsPerPage */   0,
       /* totalResultCount */ 2,
       /* firstResultIndex */ 0,
-      /* results */          YELLOW_SEARCH_RESULTS,
-      /* pagination */       {}
+      /* results */ {
+        SEARCH_RESULT(
+          /*link*/       "/ROOT%23%3F/content/zimfile/A/Eleanor_Rigby",
+          /*title*/      "Eleanor Rigby",
+          /*snippet*/    R"SNIPPET(...-side "<b>Yellow</b> Submarine" (double A-side) Released 5 August 1966 (1966-08-05) Format 7-inch single Recorded 28–29 April &amp; 6 June 1966 Studio EMI, London Genre Baroque pop, art rock Length 2:08 Label Parlophone (UK), Capitol (US) Songwriter(s) Lennon–McCartney Producer(s) George Martin The Beatles singles chronology "Paperback Writer" (1966) "Eleanor Rigby" / "<b>Yellow</b> Submarine" (1966) "Strawberry Fields Forever" / "Penny Lane" (1967) Music video "Eleanor Rigby" on YouTube The song continued the......)SNIPPET",
+          /*bookTitle*/  "Ray Charles",
+          /*wordCount*/  "201"
+        ),
+
+        SEARCH_RESULT(
+          /*link*/       "/ROOT%23%3F/content/zimfile/A/If_You_Go_Away",
+          /*title*/      "If You Go Away",
+          /*snippet*/    R"SNIPPET(...standard and has been recorded by many artists, including Greta Keller, for whom some say McKuen wrote the lyrics. "If You Go Away" Single by Damita Jo from the album If You Go Away B-side "<b>Yellow</b> Days" Released 1966 Genre Jazz Length 3:49 Label Epic Records Songwriter(s) Jacques Brel, Rod McKuen Producer(s) Bob Morgan Damita Jo singles chronology "Gotta Travel On" (1965) "If You Go Away" (1966) "Walk Away" (1967) Damita Jo reached #10 on the Adult Contemporary chart and #68 on the Billboard Hot 100 in 1966 for her version of the song. Terry Jacks recorded a version of the song which was released as a single in 1974 and reached #29 on the Adult Contemporary chart, #68 on the......)SNIPPET",
+          /*bookTitle*/  "Ray Charles",
+          /*wordCount*/  "204"
+        )
+      },
+      /* pagination */ {}
     },
 
     {
-      /* query */          "pattern=%20yellow%20&books.id=" RAYCHARLESZIMID,
+      /* query */          "pattern=yellow&books.id=" RAYCHARLESZIMID,
       /* start */            0,
       /* resultsPerPage */   0,
       /* totalResultCount */ 2,
       /* firstResultIndex */ 0,
-      /* results */          YELLOW_SEARCH_RESULTS,
-      /* pagination */       {}
-    },
+      /* results */ {
+        SEARCH_RESULT(
+          /*link*/       "/ROOT%23%3F/content/zimfile/A/Eleanor_Rigby",
+          /*title*/      "Eleanor Rigby",
+          /*snippet*/    R"SNIPPET(...-side "<b>Yellow</b> Submarine" (double A-side) Released 5 August 1966 (1966-08-05) Format 7-inch single Recorded 28–29 April &amp; 6 June 1966 Studio EMI, London Genre Baroque pop, art rock Length 2:08 Label Parlophone (UK), Capitol (US) Songwriter(s) Lennon–McCartney Producer(s) George Martin The Beatles singles chronology "Paperback Writer" (1966) "Eleanor Rigby" / "<b>Yellow</b> Submarine" (1966) "Strawberry Fields Forever" / "Penny Lane" (1967) Music video "Eleanor Rigby" on YouTube The song continued the......)SNIPPET",
+          /*bookTitle*/  "Ray Charles",
+          /*wordCount*/  "201"
+        ),
 
-    {
-      /* query */          "pattern=yellow%20submarine&books.id=" RAYCHARLESZIMID,
-      /* start */            0,
-      /* resultsPerPage */   0,
-      /* totalResultCount */ 1,
-      /* firstResultIndex */ 0,
-      /* results */          { YELLOW_SEARCH_RESULTS[0] },
-      /* pagination */       {}
+        SEARCH_RESULT(
+          /*link*/       "/ROOT%23%3F/content/zimfile/A/If_You_Go_Away",
+          /*title*/      "If You Go Away",
+          /*snippet*/    R"SNIPPET(...standard and has been recorded by many artists, including Greta Keller, for whom some say McKuen wrote the lyrics. "If You Go Away" Single by Damita Jo from the album If You Go Away B-side "<b>Yellow</b> Days" Released 1966 Genre Jazz Length 3:49 Label Epic Records Songwriter(s) Jacques Brel, Rod McKuen Producer(s) Bob Morgan Damita Jo singles chronology "Gotta Travel On" (1965) "If You Go Away" (1966) "Walk Away" (1967) Damita Jo reached #10 on the Adult Contemporary chart and #68 on the Billboard Hot 100 in 1966 for her version of the song. Terry Jacks recorded a version of the song which was released as a single in 1974 and reached #29 on the Adult Contemporary chart, #68 on the......)SNIPPET",
+          /*bookTitle*/  "Ray Charles",
+          /*wordCount*/  "204"
+        )
+      },
+      /* pagination */ {}
     },
 
     {

test/spelling_correction.cpp

@@ -173,8 +173,7 @@ void testSpellingCorrections(const kiwix::SpellingsDB& spellingsDB)
   EXPECT_SPELLING_CORRECTION("Loremipsum", 1, ({"Lorem ipsum"}));
 
   // Only one spelling correction can be requested
-  // EXPECT_SPELLING_CORRECTION("Kung",  2, ({"King", "Kong"}));
-  EXPECT_THROW(spellingsDB.getSpellingCorrections("Kung", 2), std::runtime_error);
+  EXPECT_SPELLING_CORRECTION("Kung",  2, ({"King", "Kong"}));
 }
 
 using StrCollection = std::vector<std::string>;
@@ -190,21 +189,21 @@ StrCollection directoryEntries(std::filesystem::path dirPath)
 
 TEST_F(SpellingCorrectionTest, allInOne)
 {
-  const auto tmpDirModTime0 = std::filesystem::last_write_time(tmpDirPath);
+  //const auto tmpDirModTime0 = std::filesystem::last_write_time(tmpDirPath);
   ASSERT_TRUE(directoryEntries(tmpDirPath).empty());
   {
     const kiwix::SpellingsDB spellingsDB(*archive, tmpDirPath);
     testSpellingCorrections(spellingsDB);
   }
 
-  const auto tmpDirModTime1 = std::filesystem::last_write_time(tmpDirPath);
+  //const auto tmpDirModTime1 = std::filesystem::last_write_time(tmpDirPath);
 
-  const auto spellingsDbPath = tmpDirPath / "554c9707-897e-097a-53ba-1b1306d8bb88.spellingsdb.v0.1";
+  const auto spellingsDbPath = tmpDirPath / "554c9707-897e-097a-53ba-1b1306d8bb88.spellingsdb.v0.2";
 
   const StrCollection EXPECTED_DIR_CONTENT{ spellingsDbPath.string() };
   ASSERT_EQ(directoryEntries(tmpDirPath), EXPECTED_DIR_CONTENT);
-  ASSERT_LT(tmpDirModTime0, tmpDirModTime1);
-  const auto fileModTime = std::filesystem::last_write_time(spellingsDbPath);
+  //ASSERT_LT(tmpDirModTime0, tmpDirModTime1);
+  //const auto fileModTime = std::filesystem::last_write_time(spellingsDbPath);
 
   {
     const kiwix::SpellingsDB spellingsDB(*archive, tmpDirPath);
@@ -212,6 +211,6 @@ TEST_F(SpellingCorrectionTest, allInOne)
   }
 
   ASSERT_EQ(directoryEntries(tmpDirPath), EXPECTED_DIR_CONTENT );
-  ASSERT_EQ(tmpDirModTime1, std::filesystem::last_write_time(tmpDirPath));
-  ASSERT_EQ(fileModTime,    std::filesystem::last_write_time(spellingsDbPath));
+  //ASSERT_EQ(tmpDirModTime1, std::filesystem::last_write_time(tmpDirPath));
+  //ASSERT_EQ(fileModTime,    std::filesystem::last_write_time(spellingsDbPath));
 }

test/stringTools.cpp

@@ -184,47 +184,4 @@ TEST(stringTools, getSlugifiedFileName)
 #endif
 }
 
-TEST(stringTools, Trim)
-{
-    EXPECT_EQ(kiwix::trim(""), "");
-    EXPECT_EQ(kiwix::trim("abc123"), "abc123");
-    EXPECT_EQ(kiwix::trim("   abc123"), "abc123");
-    EXPECT_EQ(kiwix::trim("abc123   "), "abc123");
-    EXPECT_EQ(kiwix::trim("   abc123   "), "abc123");
-    EXPECT_EQ(kiwix::trim("abc 123"), "abc 123");
-    EXPECT_EQ(kiwix::trim("     "), "");
-    EXPECT_EQ(kiwix::trim("\t abc123 \n"), "abc123");
-}
-
-TEST(stringTools, removeAccents)
-{
-    EXPECT_EQ(kiwix::removeAccents(""), "");
-
-    EXPECT_EQ(kiwix::removeAccents("qwertyuiop[]\\"), "qwertyuiop[]\\");
-    EXPECT_EQ(kiwix::removeAccents("asdfghjkl;'"),    "asdfghjkl;'");
-    EXPECT_EQ(kiwix::removeAccents("zxcvbnm,./"),     "zxcvbnm,./");
-    EXPECT_EQ(kiwix::removeAccents("`1234567890-="),  "`1234567890-=");
-
-    // Surprise! removeAccents() changes case to lower
-    EXPECT_EQ(kiwix::removeAccents("QWERTYUIOP{}|"), "qwertyuiop{}|");
-    EXPECT_EQ(kiwix::removeAccents("ASDFGHJKL:\""),    "asdfghjkl:\"");
-    EXPECT_EQ(kiwix::removeAccents("ZXCVBNM<>?"),     "zxcvbnm<>?");
-    EXPECT_EQ(kiwix::removeAccents("~!@#$%^&*()_+"),  "~!@#$%^&*()_+");
-
-    // removeAccents() removes diacritics (while also changing case)
-    EXPECT_EQ(kiwix::removeAccents("åçêȟïñöş"), "acehinos");
-    EXPECT_EQ(kiwix::removeAccents("ÅÇÊȞÏÑÖŞ"), "acehinos");
-
-    // removeAccents() doesn't mess with certain letters of European scripts
-    EXPECT_EQ(kiwix::removeAccents("ßæœøł"), "ßæœøł");
-
-    // Case is changed for non-ASCII letters too
-    EXPECT_EQ(kiwix::removeAccents("ÆŒØŁΓΦΣԱԲԳДЖИ"),  "æœøłγφσաբգджи");
-
-    // removeAccents() doesn't mess with symbols derived from Latin letters
-    EXPECT_EQ(kiwix::removeAccents("$¢"), "$¢");
-
-    EXPECT_EQ(kiwix::removeAccents("Mïß Ůñîvèrsé"), "miß universe");
-}
-
-} // unnamed namespace
+};

test/testing_tools.h

@@ -1,57 +0,0 @@
-/*
- * Copyright 2026 Veloman Yunkan
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef LIBKIWIX_TESTING_TOOLS_H
-#define LIBKIWIX_TESTING_TOOLS_H
-
-#include <sstream>
-#include <iostream>
-
-namespace kiwix
-{
-
-namespace testing
-{
-
-class CapturedStderr
-{
-  std::ostringstream buffer;
-  std::streambuf* const sbuf;
-public:
-  CapturedStderr()
-    : sbuf(std::cerr.rdbuf())
-  {
-    std::cerr.rdbuf(buffer.rdbuf());
-  }
-
-  CapturedStderr(const CapturedStderr&) = delete;
-
-  ~CapturedStderr()
-  {
-    std::cerr.rdbuf(sbuf);
-  }
-
-  operator std::string() const { return buffer.str(); }
-};
-
-} // namespace testing
-
-} // namespace kiwix
-
-#endif // LIBKIWIX_TESTING_TOOLS_H