emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

query-processor: only phrasify indexable terms

This commit is contained in:
Dirk-Jan C. Binnema 2023-09-10 23:28:39 +03:00
parent 8c5f92bacc
commit 2357db5bf1
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/mu-query-processor.cc
View File

@ -316,7 +316,8 @@ basify(Element&& element)
auto val{str->substr(pos + 1)};
if (field == Field::Id::Flags) {
if (auto&& finfo{flag_info(val)}; finfo)
element.value = Element::Basic{field->name, std::string{finfo->name}};
element.value = Element::Basic{field->name,
std::string{finfo->name}};
else
Element::Basic{*str};
} else if (field == Field::Id::Priority) {
@ -343,9 +344,12 @@ phrasify(Element&& element)
if (!basic)
return element;
auto&& val{basic->value};
if (val.find(' ') != std::string::npos)
element.value = Element::Phrase{basic->field, val};
auto&& field = field_from_name(*basic->field);
if (!field || field->is_indexable_term()) {
auto&& val{basic->value};
if (val.find(' ') != std::string::npos)
element.value = Element::Phrase{basic->field, val};
}
return element;
}
@ -521,10 +525,13 @@ static void
test_processor()
{
std::vector<TestCase> cases = {
// basics
TestCase{R"(hello world)", R"(((_ "hello") (_ "world")))"},
TestCase{R"("hello world")", R"(((_ (phrase "hello world"))))"},
TestCase{R"(subject:"hello world")", R"(((subject (phrase "hello world"))))"},
// TODO: add more...
// maildir must _not_ be phrasified
TestCase{R"(maildir:/"hello world")", R"(((maildir "/hello world")))"},
};
for (auto&& test: cases) {
@ -533,8 +540,6 @@ test_processor()
}
}
int
main(int argc, char* argv[])
{