From c0657947b1d49924d2fc45ee66fbd185b1d49fcd Mon Sep 17 00:00:00 2001 From: Albert S Date: Tue, 4 Jan 2022 11:09:41 +0100 Subject: [PATCH] LooqsQuery: Add hasContentSearch(),hasPathSearch() convenience functions --- shared/looqsquery.cpp | 12 +++++++++++- shared/looqsquery.h | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/shared/looqsquery.cpp b/shared/looqsquery.cpp index 5416da8..b11137e 100644 --- a/shared/looqsquery.cpp +++ b/shared/looqsquery.cpp @@ -23,6 +23,16 @@ QueryType LooqsQuery::getQueryType() return static_cast(tokensMask & COMBINED); } +bool LooqsQuery::hasContentSearch() +{ + return (this->getTokensMask() & FILTER_CONTENT) == FILTER_CONTENT; +} + +bool LooqsQuery::hasPathSearch() +{ + return (this->getTokensMask() & FILTER_PATH) == FILTER_PATH; +} + void LooqsQuery::addSortCondition(SortCondition sc) { this->sortConditions.append(sc); @@ -312,7 +322,7 @@ LooqsQuery LooqsQuery::build(QString expression, TokenType loneWordsTokenType, b } } - bool contentsearch = (result.getTokensMask() & FILTER_CONTENT) == FILTER_CONTENT; + bool contentsearch = result.hasContentSearch(); bool sortsForContent = std::any_of(result.sortConditions.begin(), result.sortConditions.end(), [](SortCondition c) { return c.field == CONTENT_TEXT; }); diff --git a/shared/looqsquery.h b/shared/looqsquery.h index c0a0e76..115377e 100644 --- a/shared/looqsquery.h +++ b/shared/looqsquery.h @@ -52,6 +52,9 @@ class LooqsQuery { return tokensMask; } + bool hasContentSearch(); + bool hasPathSearch(); + void addSortCondition(SortCondition sc); static bool checkParanthesis(QString query); static LooqsQuery build(QString query, TokenType loneWordsTokenType, bool mergeLoneWords);