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

lib/parse-sexp: support actual date queries.

Browse source 
The default argument processing overlaps somewhat with what is already
done in _notmuch_date_strings_to_query, but we can give more specific
error messages for the s-expression context.

The extra generality of _sexp_parse_range will be useful when we
implement additional range prefixes (at least 'lastmod' is needed).
This commit is contained in:
David Bremner 2022-01-20 09:36:03 -04:00
parent bf3cc5eed2
commit 77ab961a1d
2 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lib/parse-sexp.cc
View file

@ -450,15 +450,52 @@ _sexp_expand_param (notmuch_database_t *notmuch, const _sexp_prefix_t *parent,
}
static notmuch_status_t
_sexp_parse_date (notmuch_database_t *notmuch, const sexp_t *sx, Xapian::Query &output)
_sexp_parse_range (notmuch_database_t *notmuch, const _sexp_prefix_t *prefix,
const sexp_t *sx, Xapian::Query &output)
{
/* empty date matches everything */
const char *from, *to;
std::string msg;
/* empty range matches everything */
if (! sx) {
output = Xapian::Query::MatchAll;
return NOTMUCH_STATUS_SUCCESS;
}
_notmuch_database_log (notmuch, "unimplemented date query\n");
if (sx->ty == SEXP_LIST) {
_notmuch_database_log (notmuch, "expected atom as first argument of '%s'\n", prefix->name);
return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
}
from = sx->val;
to = from;
if (sx->next) {
if (sx->next->ty == SEXP_LIST) {
_notmuch_database_log (notmuch, "expected atom as second argument of '%s'\n",
prefix->name);
return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
}
if (sx->next->next) {
_notmuch_database_log (notmuch, "'%s' expects maximum of two arguments\n", prefix->name);
return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
}
to = sx->next->val;
}
if (strcmp (prefix->name, "date") == 0) {
notmuch_status_t status;
status = _notmuch_date_strings_to_query (NOTMUCH_VALUE_TIMESTAMP, from, to, output, msg);
if (status) {
if (! msg.empty ())
_notmuch_database_log (notmuch, "%s\n", msg.c_str ());
}
return status;
}
_notmuch_database_log (notmuch, "unimplimented range prefix: '%s'\n", prefix->name);
return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
}
@ -557,9 +594,8 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent
return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
}
if (strcmp (prefix->name, "date") == 0) {
return _sexp_parse_date (notmuch, sx->list->next, output);
}
if (prefix->flags & SEXP_FLAG_RANGE)
return _sexp_parse_range (notmuch, prefix, sx->list->next, output);
if (strcmp (prefix->name, "infix") == 0) {
return _sexp_parse_infix (notmuch, sx->list->next, output);

6
test/T081-sexpr-search.sh
View file

@ -774,13 +774,11 @@ notmuch search --query=sexp '(and (date) (from keithp))'| notmuch_search_saniti
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "date query, one argument"
test_subtest_known_broken
notmuch search date:2009-11-18 and from:keithp | notmuch_search_sanitize > EXPECTED
notmuch search --query=sexp '(and (date 2009-11-18) (from keithp))' | notmuch_search_sanitize > OUTPUT
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "date query, two arguments"
test_subtest_known_broken
notmuch search date:2009-11-17..2009-11-18 and from:keithp | notmuch_search_sanitize > EXPECTED
notmuch search --query=sexp '(and (date 2009-11-17 2009-11-18) (from keithp))' | notmuch_search_sanitize > OUTPUT
test_expect_equal_file EXPECTED OUTPUT
@ -802,7 +800,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "date query, illegal nesting 3"
test_subtest_known_broken
notmuch search --query=sexp '(date (to))' > OUTPUT 2>&1
cat <<EOF > EXPECTED
notmuch search: Syntax error in query
@ -811,7 +808,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "date query, illegal nesting 4"
test_subtest_known_broken
notmuch search --query=sexp '(date today (to))' > OUTPUT 2>&1
cat <<EOF > EXPECTED
notmuch search: Syntax error in query
@ -820,7 +816,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "date query, too many arguments"
test_subtest_known_broken
notmuch search --query=sexp '(date yesterday and tommorow)' > OUTPUT 2>&1
cat <<EOF > EXPECTED
notmuch search: Syntax error in query
@ -829,7 +824,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "date query, bad date"
test_subtest_known_broken
notmuch search --query=sexp '(date "hawaiian-pizza-day")' > OUTPUT 2>&1
cat <<EOF > EXPECTED
notmuch search: Syntax error in query