This provides functionality analogous to query: in the Xapian QueryParser based parser. Perhaps counterintuitively, the saved queries currently have to be in the original query syntax (i.e. not s-expressions). --- lib/parse-sexp.cc | 10 ++++++++++ test/T081-sexpr-search.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+)
diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc index 29c5cd31..1be2a4be 100644 --- a/lib/parse-sexp.cc +++ b/lib/parse-sexp.cc @@ -2,6 +2,7 @@ #include "notmuch-private.h" #include "sexp.h" #include "parse-time-vrp.h" +#include "query-fp.h" typedef struct { const char *name; @@ -35,6 +36,7 @@ static _sexp_field_t fields[] = { "mimetype", Xapian::Query::OP_PHRASE }, { "path", Xapian::Query::OP_OR }, { "property", Xapian::Query::OP_AND }, + { "query", Xapian::Query::OP_INVALID }, { "subject", Xapian::Query::OP_PHRASE }, { "tag", Xapian::Query::OP_AND }, { "thread", Xapian::Query::OP_OR }, @@ -208,6 +210,14 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const sexp_t *sx, Xapian::Qu if (strcasecmp (field->name, "date") == 0) { return _sexp_parse_date (notmuch, sx, output); } + if (strcasecmp (field->name, "query") == 0) { + if (! sx->list->next || ! sx->list->next->val) { + _notmuch_database_log (notmuch, "missing query name\n"); + return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; + } else { + return _notmuch_query_name_to_query (notmuch, sx->list->next->val, output); + } + } return _sexp_combine_field (_find_prefix (field->name), field->xapian_op, sx->list->next, output); diff --git a/test/T081-sexpr-search.sh b/test/T081-sexpr-search.sh index c9dd8f39..89f1c36f 100755 --- a/test/T081-sexpr-search.sh +++ b/test/T081-sexpr-search.sh @@ -153,6 +153,34 @@ notmuch search mimetype:text/html > EXPECTED notmuch search --query-syntax=sexp '(mimetype text html)' > OUTPUT test_expect_equal_file EXPECTED OUTPUT +QUERYSTR="date:2009-11-18..2009-11-18 and tag:unread" +QUERYSTR2="query:test and subject:Maildir" +notmuch config set --database query.test "$QUERYSTR" +notmuch config set query.test2 "$QUERYSTR2" + +test_begin_subtest "ill-formed named query search" +notmuch search --query-syntax=sexp '(query)' > OUTPUT 2>&1 +cat <<EOF > EXPECTED +notmuch search: Syntax error in query +missing query name +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "search named query" +notmuch search --query-syntax=sexp '(query test)' > OUTPUT +notmuch search $QUERYSTR > EXPECTED +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "search named query with other terms" +notmuch search --query-syntax=sexp '(and (query test) (subject Maildir))' > OUTPUT +notmuch search $QUERYSTR and subject:Maildir > EXPECTED +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "search nested named query" +notmuch search --query-syntax=sexp '(query test2)' > OUTPUT +notmuch search $QUERYSTR2 > EXPECTED +test_expect_equal_file EXPECTED OUTPUT + test_begin_subtest "Search by 'subject'" add_message [subject]=subjectsearchtest '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' output=$(notmuch search --query-syntax=sexp '(subject subjectsearchtest)' | notmuch_search_sanitize) -- 2.30.2 _______________________________________________ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-le...@notmuchmail.org