kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-22 11:37:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1086 from kiwix/handling_of_corrupted_xapian_db

Browse Source 
Handling of corrupted Xapian DB during search
This commit is contained in:
Kelson 2024-04-12 16:57:20 +02:00 committed by GitHub
commit cce7de8820
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/urlschemehandler.cpp
View File

@ -100,6 +100,25 @@ class IdNameMapper : public kiwix::NameMapper {
};
namespace
{
struct SearchResultsWithEstimatedMatchCount
{
std::shared_ptr<zim::SearchResultSet> results;
int estimatedMatchCount = 0;
};
SearchResultsWithEstimatedMatchCount getSearchResults(zim::Search& s, int start, int pageLength)
{
SearchResultsWithEstimatedMatchCount r;
r.estimatedMatchCount = s.getEstimatedMatches();
r.results = std::make_shared<zim::SearchResultSet>(s.getResults(start, pageLength));
return r;
}
} // unnamed namespace
void
UrlSchemeHandler::handleSearchRequest(QWebEngineUrlRequestJob* request)
{
@ -131,10 +150,19 @@ UrlSchemeHandler::handleSearchRequest(QWebEngineUrlRequestJob* request)
request->fail(QWebEngineUrlRequestJob::UrlInvalid);
return;
}
SearchResultsWithEstimatedMatchCount searchResult;
try {
searchResult = getSearchResults(*search, start, pageLength);
} catch (...) {
request->fail(QWebEngineUrlRequestJob::RequestFailed);
return;
}
kiwix::SearchRenderer renderer(
search->getResults(start, pageLength),
*searchResult.results,
start,
search->getEstimatedMatches());
searchResult.estimatedMatchCount);
renderer.setSearchPattern(searchQuery);
renderer.setSearchBookQuery("content="+bookId.toStdString());
renderer.setProtocolPrefix("zim://");