This essentially mimics the ThreadFieldProcessor code, but generating
the notmuch_query_t via the new notmuch_query_from_sexp using a
subtree of the already parsed s-expression.
---
lib/parse-sexp.cc | 27 +++++++++++++++++++++++----
test/T081-sexpr-search.sh | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc
index cfd503d9..df3629af 100644
--- a/lib/parse-sexp.cc
+++ b/lib/parse-sexp.cc
@@ -11,9 +11,10 @@ typedef struct {
} _sexp_op_t;
typedef enum {
- SEXP_FLAG_NONE = 0,
- SEXP_FLAG_WILDCARD = 1 << 0,
- SEXP_FLAG_REGEXP = 1 << 1,
+ SEXP_FLAG_NONE = 0,
+ SEXP_FLAG_WILDCARD = 1 << 0,
+ SEXP_FLAG_REGEXP = 1 << 1,
+ SEXP_FLAG_THREAD_MATCH = 1 << 2,
} _sexp_flag_t;
/*
@@ -63,7 +64,7 @@ static _sexp_field_t fields[] =
{ "query", Xapian::Query::OP_INVALID, SEXP_FLAG_NONE },
{ "subject", Xapian::Query::OP_PHRASE, SEXP_FLAG_REGEXP },
{ "tag", Xapian::Query::OP_AND, SEXP_FLAG_WILDCARD |
SEXP_FLAG_REGEXP },
- { "thread", Xapian::Query::OP_OR, SEXP_FLAG_REGEXP },
+ { "thread", Xapian::Query::OP_OR, SEXP_FLAG_REGEXP |
SEXP_FLAG_THREAD_MATCH },
{ "to", Xapian::Query::OP_PHRASE, SEXP_FLAG_NONE },
{ }
};
@@ -78,6 +79,7 @@ static _sexp_keyword_t keywords[] =
{ "any", SEXP_FLAG_WILDCARD },
{ "*", SEXP_FLAG_WILDCARD },
{ "rx", SEXP_FLAG_REGEXP },
+ { "match", SEXP_FLAG_THREAD_MATCH },
{ }
};
@@ -313,6 +315,23 @@ _notmuch_sexp_to_xapian_query (notmuch_database_t
*notmuch, const sexp_t *sx, Xa
return _notmuch_regexp_to_query (notmuch,
Xapian::BAD_VALUENO, field->name,
rest->val, output, msg);
}
+ } else if (flags & SEXP_FLAG_THREAD_MATCH) {
+ if (! rest) {
+ _notmuch_database_log (notmuch, "missing subquery\n");
+ return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
+ } else {
+ notmuch_query_t *query;
+ std::string msg;
+
+ status = _notmuch_query_from_sexpr (notmuch, rest, query);
+ if (status)
+ return status;
+ status = _notmuch_query_expand_to_threads (query, output,
msg);
+ if (status) {
+ _notmuch_database_log (notmuch, "error expanding query
%s\n", msg.c_str ());
+ }
+ return status;
+ }
} else {
return _sexp_combine_field (term_prefix, field->xapian_op, rest,
output);
diff --git a/test/T081-sexpr-search.sh b/test/T081-sexpr-search.sh
index 281a9bf7..f0a7efb0 100755
--- a/test/T081-sexpr-search.sh
+++ b/test/T081-sexpr-search.sh
@@ -436,4 +436,39 @@ notmuch search --output=threads '*' | grep '7$' > EXPECTED
notmuch search --output=threads --query-syntax=sexp '(thread :rx 7$)' > OUTPUT
test_expect_equal_file EXPECTED OUTPUT
+test_begin_subtest "Basic query that matches no messages"
+count=$(notmuch count from:keithp and to:keithp)
+test_expect_equal 0 "$count"
+
+test_begin_subtest "Same query against threads"
+notmuch search --query-syntax=sexp '(and (thread :match (from keithp)) (thread
:match (to keithp)))' \
+ | notmuch_search_sanitize > OUTPUT
+cat<<EOF > EXPECTED
+thread:XXX 2009-11-18 [7/7] Lars Kellogg-Stedman, Mikhail Gusarov, Keith
Packard, Carl Worth; [notmuch] Working with Maildir storage? (inbox signed
unread)
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "Mix thread and non-threads query"
+notmuch search --query-syntax=sexp '(and (thread :match keithp) (to keithp))'
| notmuch_search_sanitize > OUTPUT
+cat<<EOF > EXPECTED
+thread:XXX 2009-11-18 [1/7] Lars Kellogg-Stedman| Mikhail Gusarov, Keith
Packard, Carl Worth; [notmuch] Working with Maildir storage? (inbox signed
unread)
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "Compound subquery"
+notmuch search --query-syntax=sexp '(and (thread :match (and (from keithp)
(date 2009))) (thread :match (to keithp)))' \
+ | notmuch_search_sanitize > OUTPUT
+cat<<EOF > EXPECTED
+thread:XXX 2009-11-18 [7/7] Lars Kellogg-Stedman, Mikhail Gusarov, Keith
Packard, Carl Worth; [notmuch] Working with Maildir storage? (inbox signed
unread)
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "missing subquery"
+notmuch search --query-syntax=sexp '(thread :match)' 1>OUTPUT 2>&1
+cat<<EOF > EXPECTED
+notmuch search: Syntax error in query
+missing subquery
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
test_done
--
2.30.2
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org
