From 956c597e80fba8dd8362f7eb68d2a031f955e065 Mon Sep 17 00:00:00 2001 From: Nikhil Tanwar <2002nikhiltanwar@gmail.com> Date: Wed, 31 Aug 2022 20:27:16 +0530 Subject: [PATCH] fixup! Extract parseQuery() --- src/library.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/library.cpp b/src/library.cpp index e45d1d48..1bc36090 100644 --- a/src/library.cpp +++ b/src/library.cpp @@ -525,7 +525,7 @@ Xapian::Query buildXapianQueryFromFilterQuery(const Filter& filter) return queryParser.parse_query(normalizeText(filter.getQuery()), flags); } -Xapian::Query parseQuery(const std::string& query, const std::string& prefix) +Xapian::Query makePhraseQuery(const std::string& query, const std::string& prefix) { Xapian::QueryParser queryParser; queryParser.set_default_op(Xapian::Query::OP_OR); @@ -550,7 +550,7 @@ Xapian::Query aliasNamesQuery(const Filter::AliasNames& aliasNames) Xapian::Query q = Xapian::Query(std::string()); std::vector queryVec; for (const auto& aliasName : aliasNames) { - queryVec.push_back(parseQuery(aliasName, "XF")); + queryVec.push_back(makePhraseQuery(aliasName, "XF")); } Xapian::Query combinedQuery(Xapian::Query::OP_OR, queryVec.begin(), queryVec.end()); q = Xapian::Query(Xapian::Query::OP_FILTER, q, combinedQuery); @@ -564,12 +564,12 @@ Xapian::Query langQuery(const std::string& lang) Xapian::Query publisherQuery(const std::string& publisher) { - return parseQuery(publisher, "XP"); + return makePhraseQuery(publisher, "XP"); } Xapian::Query creatorQuery(const std::string& creator) { - return parseQuery(creator, "A"); + return makePhraseQuery(creator, "A"); } Xapian::Query tagsQuery(const Filter::Tags& acceptTags, const Filter::Tags& rejectTags)