[TEMP] Disabled reader's search API

Author: renaud gaudin

libzim/lib.h

@@ -57,13 +57,13 @@ class ZimEntry : public zim::Entry
     { return to_ptr<ZimEntry>(zim::Entry::getRedirectEntry()); }
 };
 
-class ZimSearch : public zim::Search
-{
-  public:
-    ZimSearch() : zim::Search(std::vector<zim::Archive>{}) {};
-    ZimSearch(zim::Archive& archive) : zim::Search(archive) {};
-    ZimSearch(const Search& search) : zim::Search(search) {};
-};
+// class ZimSearch : public zim::Search
+// {
+//   public:
+//     ZimSearch() : zim::Search(std::vector<zim::Archive>{}) {};
+//     ZimSearch(zim::Archive& archive) : zim::Search(archive) {};
+//     ZimSearch(const Search& search) : zim::Search(search) {};
+// };
 
 class ZimArchive : public zim::Archive
 {

libzim/wrapper.pyx

@@ -620,15 +620,15 @@ cdef class PyArchive:
             -------
             Generator
                 Path of suggested entry """
-        cdef wrapper.ZimSearch search = wrapper.ZimSearch(dereference(self.c_archive))
-        search.set_suggestion_mode(True)
-        search.set_query(query.encode('UTF-8'))
-        search.set_range(start, end)
+        # cdef wrapper.ZimSearch search = wrapper.ZimSearch(dereference(self.c_archive))
+        # search.set_suggestion_mode(True)
+        # search.set_query(query.encode('UTF-8'))
+        # search.set_range(start, end)
 
-        cdef wrapper.search_iterator it = search.begin()
-        while it != search.end():
-            yield it.get_path().decode('UTF-8')
-            preincrement(it)
+        # cdef wrapper.search_iterator it = search.begin()
+        # while it != search.end():
+        #     yield it.get_path().decode('UTF-8')
+        #     preincrement(it)
 
     def search(self, query: str, start: int = 0, end: int = 10) -> Generator[str, None, None]:
         """ Paths of entries in the archive from a search query -> Generator[str, None, None]
@@ -646,15 +646,15 @@ cdef class PyArchive:
             Generator
                 Path of entry matching the search query """
 
-        cdef wrapper.ZimSearch search = wrapper.ZimSearch(dereference(self.c_archive))
-        search.set_suggestion_mode(False)
-        search.set_query(query.encode('UTF-8'))
-        search.set_range(start, end)
+        # cdef wrapper.ZimSearch search = wrapper.ZimSearch(dereference(self.c_archive))
+        # search.set_suggestion_mode(False)
+        # search.set_query(query.encode('UTF-8'))
+        # search.set_range(start, end)
 
-        cdef wrapper.search_iterator it = search.begin()
-        while it != search.end():
-            yield it.get_path().decode('UTF-8')
-            preincrement(it)
+        # cdef wrapper.search_iterator it = search.begin()
+        # while it != search.end():
+        #     yield it.get_path().decode('UTF-8')
+        #     preincrement(it)
 
     def get_estimated_search_results_count(self, query: str) -> int:
         """ Estimated number of search results for a query -> int
@@ -667,12 +667,12 @@ cdef class PyArchive:
             -------
             int
                 Estimated number of search results """
-        cdef wrapper.ZimSearch search = wrapper.ZimSearch(dereference(self.c_archive))
-        search.set_suggestion_mode(False)
-        search.set_query(query.encode('UTF-8'))
-        search.set_range(0, self.entry_count)
+        # cdef wrapper.ZimSearch search = wrapper.ZimSearch(dereference(self.c_archive))
+        # search.set_suggestion_mode(False)
+        # search.set_query(query.encode('UTF-8'))
+        # search.set_range(0, self.entry_count)
 
-        return search.get_matches_estimated()
+        # return search.get_matches_estimated()
 
     def get_estimated_suggestions_results_count(self, query: str) -> int:
         """ Estimated number of suggestions for a query -> int
@@ -685,12 +685,12 @@ cdef class PyArchive:
             -------
             int
                 Estimated number of article suggestions """
-        cdef wrapper.ZimSearch search = wrapper.ZimSearch(dereference(self.c_archive))
-        search.set_suggestion_mode(True)
-        search.set_query(query.encode('UTF-8'))
-        search.set_range(0, self.entry_count)
+        # cdef wrapper.ZimSearch search = wrapper.ZimSearch(dereference(self.c_archive))
+        # search.set_suggestion_mode(True)
+        # search.set_query(query.encode('UTF-8'))
+        # search.set_range(0, self.entry_count)
 
-        return search.get_matches_estimated()
+        # return search.get_matches_estimated()
 
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}(filename={self.filename})"

tests/test_libzim_creator.py

@@ -450,8 +450,9 @@ def test_creator_redirection(fpath, lipsum_item):
         == zim.get_entry_by_path(HOME_PATH).path
     )
     assert zim.get_entry_by_path("accueil").get_item().path == HOME_PATH
-    assert "home" in list(zim.suggest("hello"))
-    assert "accueil" in list(zim.suggest("bonjour"))
+    # TODO: restore [search-api]
+    # assert "home" in list(zim.suggest("hello"))
+    # assert "accueil" in list(zim.suggest("bonjour"))
 
 
 def test_item_notimplemented(fpath, lipsum_item):

tests/test_libzim_reader.py

@@ -380,13 +380,14 @@ def test_reader_suggest_search(
 
     # suggestion and search results
     assert zim.entry_count == entry_count
-    assert (
-        zim.get_estimated_suggestions_results_count(suggestion_string)
-        == suggestion_count
-    )
-    assert list(zim.suggest(suggestion_string)) == suggestion_result
-    assert zim.get_estimated_search_results_count(search_string) == search_count
-    assert list(zim.search(search_string)) == search_result
+# TODO: restore [search-api]
+#     assert (
+#         zim.get_estimated_suggestions_results_count(suggestion_string)
+#         == suggestion_count
+#     )
+#     assert list(zim.suggest(suggestion_string)) == suggestion_result
+#     assert zim.get_estimated_search_results_count(search_string) == search_count
+#     assert list(zim.search(search_string)) == search_result
 
 
 @pytest.mark.parametrize(