debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: handle empty string in regexp field processors

Browse source 
The non-field processor behaviour is is convert the corresponding
queries into a search for the unprefixed terms. This yields pretty
surprising results so I decided to generate a query that would match
the terms (i.e. none with that prefix) generated for an empty header.
This commit is contained in:
David Bremner 2017-03-24 19:52:51 -03:00
parent bc0c051e04
commit cb84f84878
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/regexp-fields.cc
View file

@ -148,6 +148,11 @@ RegexpFieldProcessor::RegexpFieldProcessor (std::string prefix, Xapian::QueryPar
Xapian::Query Xapian::Query
RegexpFieldProcessor::operator() (const std::string & str) RegexpFieldProcessor::operator() (const std::string & str)
{ {
if (str.size () == 0)
return Xapian::Query(Xapian::Query::OP_AND_NOT,
Xapian::Query::MatchAll,
Xapian::Query (Xapian::Query::OP_WILDCARD, term_prefix));
if (str.at (0) == '/') { if (str.at (0) == '/') {
if (str.at (str.size () - 1) == '/'){ if (str.at (str.size () - 1) == '/'){
RegexpPostingSource *postings = new RegexpPostingSource (slot, str.substr(1,str.size () - 2)); RegexpPostingSource *postings = new RegexpPostingSource (slot, str.substr(1,str.size () - 2));

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

@ -16,7 +16,6 @@ add_message '[from]="-" [subject]="empty from"'
add_message '[subject]="-"' add_message '[subject]="-"'
test_begin_subtest "null from: search" test_begin_subtest "null from: search"
test_subtest_known_broken
notmuch search 'from:""' | notmuch_search_sanitize > OUTPUT notmuch search 'from:""' | notmuch_search_sanitize > OUTPUT
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
thread:XXX 2001-01-05 [1/1] -; empty from (inbox unread) thread:XXX 2001-01-05 [1/1] -; empty from (inbox unread)
@ -24,7 +23,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "null subject: search" test_begin_subtest "null subject: search"
test_subtest_known_broken
notmuch search 'subject:""' | notmuch_search_sanitize > OUTPUT notmuch search 'subject:""' | notmuch_search_sanitize > OUTPUT
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; - (inbox unread) thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; - (inbox unread)