diff options
| author | David Bremner <david@tethera.net> | 2018-09-30 13:27:55 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2019-03-28 14:34:37 -0300 |
| commit | d25dcc589ce4c1a87d698c6aef1ce3e38e4a50bb (patch) | |
| tree | d668d987dad7d41f91b1b1507d80fbaef4b18e50 | |
| parent | 168211c5632189c53415d25530b759ad3678c92c (diff) | |
lib: use phrase search for anything not ending in '*'
Anything that does not look like a wildcard should be safe to
quote. This should fix the problem searching for xapian keywords.
| -rw-r--r-- | lib/regexp-fields.cc | 2 | ||||
| -rwxr-xr-x | test/T650-regexp-query.sh | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/regexp-fields.cc b/lib/regexp-fields.cc index f50da9a3..5d4cf80a 100644 --- a/lib/regexp-fields.cc +++ b/lib/regexp-fields.cc @@ -194,7 +194,7 @@ RegexpFieldProcessor::operator() (const std::string & str) * phrase parsing, when possible */ std::string query_str; - if (str.find (' ') != std::string::npos) + if (*str.rbegin () != '*' || str.find (' ') != std::string::npos) query_str = '"' + str + '"'; else query_str = str; diff --git a/test/T650-regexp-query.sh b/test/T650-regexp-query.sh index e792decf..92334ba0 100755 --- a/test/T650-regexp-query.sh +++ b/test/T650-regexp-query.sh @@ -81,12 +81,10 @@ add_message '[from]="and"' '[subject]="and-and-and"' printf "id:$gen_msg_id\n" > EXPECTED test_begin_subtest "quoted xapian keyword search for from:" -test_subtest_known_broken notmuch search --output=messages 'from:"and"' > OUTPUT test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "quoted xapian keyword search for subject:" -test_subtest_known_broken notmuch search --output=messages 'subject:"and-and-and"' > OUTPUT test_expect_equal_file EXPECTED OUTPUT |