debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: use phrase search for anything not ending in '*'

Browse source 
Anything that does not look like a wildcard should be safe to
quote. This should fix the problem searching for xapian keywords.
This commit is contained in:
David Bremner 2018-09-30 13:27:55 -03:00
parent 168211c563
commit d25dcc589c
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/regexp-fields.cc
View file

@ -194,7 +194,7 @@ RegexpFieldProcessor::operator() (const std::string & str)
* phrase parsing, when possible */ * phrase parsing, when possible */
std::string query_str; std::string query_str;
if (str.find (' ') != std::string::npos) if (*str.rbegin () != '*' || str.find (' ') != std::string::npos)
query_str = '"' + str + '"'; query_str = '"' + str + '"';
else else
query_str = str; query_str = str;

2
test/T650-regexp-query.sh
View file

@ -81,12 +81,10 @@ add_message '[from]="and"' '[subject]="and-and-and"'
printf "id:$gen_msg_id\n" > EXPECTED printf "id:$gen_msg_id\n" > EXPECTED
test_begin_subtest "quoted xapian keyword search for from:" test_begin_subtest "quoted xapian keyword search for from:"
test_subtest_known_broken
notmuch search --output=messages 'from:"and"' > OUTPUT notmuch search --output=messages 'from:"and"' > OUTPUT
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "quoted xapian keyword search for subject:" test_begin_subtest "quoted xapian keyword search for subject:"
test_subtest_known_broken
notmuch search --output=messages 'subject:"and-and-and"' > OUTPUT notmuch search --output=messages 'subject:"and-and-and"' > OUTPUT
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT