smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Final logic of Library::filterViaBookDB() 

Moved the `filter.hasQuery()` check inside `buildXapianQuery()`.
`Library::filterViaBookDB()` only cares if the query that is going to be
run on the book DB would match all documents. The rest of changes
related to enhancing the usage of Xapian for the catalog search will
happen inside `buildXapianQuery()` and `updateBookDB()`.
This commit is contained in:
Veloman Yunkan 2021-04-11 20:17:37 +04:00
parent ea779ac200
commit 8287f351e7
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/library.cpp
View File

@ -298,8 +298,19 @@ void Library::updateBookDB(const Book& book)
namespace
{
bool willSelectEverything(const Xapian::Query& query)
{
return query.get_type() == Xapian::Query::LEAF_MATCH_ALL;
}
Xapian::Query buildXapianQuery(const Filter& filter)
{
if ( !filter.hasQuery() ) {
// This is a thread-safe way to construct an equivalent of
// a Xapian::Query::MatchAll query
return Xapian::Query(std::string());
}
Xapian::QueryParser queryParser;
queryParser.set_default_op(Xapian::Query::OP_AND);
queryParser.add_prefix("title", "S");
@ -323,12 +334,13 @@ Xapian::Query buildXapianQuery(const Filter& filter)
Library::BookIdCollection Library::filterViaBookDB(const Filter& filter)
{
if ( !filter.hasQuery() )
const auto query = buildXapianQuery(filter);
if ( willSelectEverything(query) )
return getBooksIds();
BookIdCollection bookIds;
const auto query = buildXapianQuery(filter);
Xapian::Enquire enquire(*m_bookDB);
enquire.set_query(query);
const auto results = enquire.get_mset(0, m_books.size());