From 38789f2f75facc1ad2d95c727ff2d53bf95074d6 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 2 Jun 2022 17:16:35 +0200 Subject: [PATCH 1/2] We now must pass the queryString to select the correct book. --- src/urlschemehandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/urlschemehandler.cpp b/src/urlschemehandler.cpp index 8a2b826..377c01b 100644 --- a/src/urlschemehandler.cpp +++ b/src/urlschemehandler.cpp @@ -116,7 +116,7 @@ UrlSchemeHandler::handleSearchRequest(QWebEngineUrlRequestJob* request) IdNameMapper nameMapper; kiwix::SearchRenderer renderer(searcher.get(), &nameMapper); renderer.setSearchPattern(searchQuery); - renderer.setSearchContent(bookId.toStdString()); + renderer.setSearchBookQuery("content="+bookId.toStdString()); renderer.setProtocolPrefix("zim://"); renderer.setSearchProtocolPrefix("zim://" + host.toStdString() + "/?"); renderer.setPageLength(pageLength); From 7b870d0def3badc6727370cfc2d1c3007af4061a Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 2 Jun 2022 17:17:49 +0200 Subject: [PATCH 2/2] `Searcher::add_reader` now takes a shared_ptr --- src/library.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/library.cpp b/src/library.cpp index 2f8478e..b814982 100644 --- a/src/library.cpp +++ b/src/library.cpp @@ -71,7 +71,7 @@ std::shared_ptr Library::getSearcher(const QString &zimId) { auto searcher = std::make_shared(); try { - searcher->add_reader(m_library.getReaderById(zimId.toStdString()).get()); + searcher->add_reader(m_library.getReaderById(zimId.toStdString())); } catch(std::out_of_range& e) { return nullptr; }