diff options
| author | David Bremner <david@tethera.net> | 2021-08-24 08:17:37 -0700 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-09-04 17:07:19 -0700 |
| commit | 6ab2d9b1a2e62b76960df8e80ff2a45d9c6a8551 (patch) | |
| tree | 2aa96273ef83eecfd6baf36542c1caaf971128dd /lib | |
| parent | 036734252d07d8568937073d4f2d366bcb06bc4e (diff) | |
lib/parse-sexp: handle saved queries
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).
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/parse-sexp.cc | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc index 089de353..0fbb2afc 100644 --- a/lib/parse-sexp.cc +++ b/lib/parse-sexp.cc @@ -17,6 +17,7 @@ typedef enum { SEXP_FLAG_DO_REGEX = 1 << 5, SEXP_FLAG_EXPAND = 1 << 6, SEXP_FLAG_DO_EXPAND = 1 << 7, + SEXP_FLAG_ORPHAN = 1 << 8, } _sexp_flag_t; /* @@ -58,7 +59,7 @@ static _sexp_prefix_t prefixes[] = { "id", Xapian::Query::OP_OR, Xapian::Query::MatchNothing, SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX }, { "infix", Xapian::Query::OP_INVALID, Xapian::Query::MatchAll, - SEXP_FLAG_SINGLE }, + SEXP_FLAG_SINGLE | SEXP_FLAG_ORPHAN }, { "is", Xapian::Query::OP_AND, Xapian::Query::MatchAll, SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND }, { "matching", Xapian::Query::OP_AND, Xapian::Query::MatchAll, @@ -77,6 +78,8 @@ static _sexp_prefix_t prefixes[] = SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX }, { "property", Xapian::Query::OP_AND, Xapian::Query::MatchAll, SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND }, + { "query", Xapian::Query::OP_INVALID, Xapian::Query::MatchNothing, + SEXP_FLAG_SINGLE | SEXP_FLAG_ORPHAN }, { "regex", Xapian::Query::OP_INVALID, Xapian::Query::MatchAll, SEXP_FLAG_SINGLE | SEXP_FLAG_DO_REGEX }, { "rx", Xapian::Query::OP_INVALID, Xapian::Query::MatchAll, @@ -245,13 +248,8 @@ _sexp_expand_query (notmuch_database_t *notmuch, } static notmuch_status_t -_sexp_parse_infix (notmuch_database_t *notmuch, const _sexp_prefix_t *parent, - const sexp_t *sx, Xapian::Query &output) +_sexp_parse_infix (notmuch_database_t *notmuch, const sexp_t *sx, Xapian::Query &output) { - if (parent) { - _notmuch_database_log (notmuch, "'infix' not supported inside '%s'\n", parent->name); - return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; - } try { output = notmuch->query_parser->parse_query (sx->val, NOTMUCH_QUERY_PARSER_FLAGS); } catch (const Xapian::QueryParserError &error) { @@ -361,6 +359,12 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent parent = prefix; } + if (parent && (prefix->flags & SEXP_FLAG_ORPHAN)) { + _notmuch_database_log (notmuch, "'%s' not supported inside '%s'\n", + prefix->name, parent->name); + return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; + } + if ((prefix->flags & SEXP_FLAG_SINGLE) && (! sx->list->next || sx->list->next->next || sx->list->next->ty != SEXP_VALUE)) { _notmuch_database_log (notmuch, "'%s' expects single atom as argument\n", @@ -369,7 +373,11 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent } if (strcmp (prefix->name, "infix") == 0) { - return _sexp_parse_infix (notmuch, parent, sx->list->next, output); + return _sexp_parse_infix (notmuch, sx->list->next, output); + } + + if (strcmp (prefix->name, "query") == 0) { + return _notmuch_query_name_to_query (notmuch, sx->list->next->val, output); } if (prefix->xapian_op == Xapian::Query::OP_WILDCARD) |