lib/parse-sexp: support zero argument date queries

These are not too practical, although they may simplify some user
query generation code. Mainly this adds a new prefix keyword to the
parser.

diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc
index 356c32ea254675749e4883743ba75f6fdd648121..f36d18a630ed578afb8986ef0021b9a38db24b99 100644 (file)
--- a/lib/parse-sexp.cc
+++ b/lib/parse-sexp.cc
@@ -32,6 +32,7 @@ typedef enum {
     SEXP_FLAG_EXPAND   = 1 << 6,
     SEXP_FLAG_DO_EXPAND = 1 << 7,
     SEXP_FLAG_ORPHAN   = 1 << 8,
     SEXP_FLAG_EXPAND   = 1 << 6,
     SEXP_FLAG_DO_EXPAND = 1 << 7,
     SEXP_FLAG_ORPHAN   = 1 << 8,

+    SEXP_FLAG_RANGE    = 1 << 9,

 } _sexp_flag_t;
 
 /*
 } _sexp_flag_t;
 
 /*


@@ -66,6 +67,8 @@ static _sexp_prefix_t prefixes[] =
       SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_EXPAND },
     { "body",           Xapian::Query::OP_AND,          Xapian::Query::MatchAll,
       SEXP_FLAG_FIELD },
       SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_EXPAND },
     { "body",           Xapian::Query::OP_AND,          Xapian::Query::MatchAll,
       SEXP_FLAG_FIELD },

+    { "date",           Xapian::Query::OP_INVALID,      Xapian::Query::MatchAll,
+      SEXP_FLAG_RANGE },

     { "from",           Xapian::Query::OP_AND,          Xapian::Query::MatchAll,
       SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND },
     { "folder",         Xapian::Query::OP_OR,           Xapian::Query::MatchNothing,
     { "from",           Xapian::Query::OP_AND,          Xapian::Query::MatchAll,
       SEXP_FLAG_FIELD | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND },
     { "folder",         Xapian::Query::OP_OR,           Xapian::Query::MatchNothing,


@@ -446,6 +449,19 @@ _sexp_expand_param (notmuch_database_t *notmuch, const _sexp_prefix_t *parent,
     return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
 }
 
     return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
 }
 

+static notmuch_status_t
+_sexp_parse_date (notmuch_database_t *notmuch, const sexp_t *sx, Xapian::Query &output)
+{
+    /* empty date matches everything */
+    if (! sx) {
+       output = Xapian::Query::MatchAll;
+       return NOTMUCH_STATUS_SUCCESS;
+    }
+
+    _notmuch_database_log (notmuch, "unimplemented date query\n");
+    return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
+}
+

 /* Here we expect the s-expression to be a proper list, with first
  * element defining and operation, or as a special case the empty
  * list */
 /* Here we expect the s-expression to be a proper list, with first
  * element defining and operation, or as a special case the empty
  * list */


@@ -519,7 +535,7 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent
 
     for (_sexp_prefix_t *prefix = prefixes; prefix && prefix->name; prefix++) {
        if (strcmp (prefix->name, sx->list->val) == 0) {
 
     for (_sexp_prefix_t *prefix = prefixes; prefix && prefix->name; prefix++) {
        if (strcmp (prefix->name, sx->list->val) == 0) {

-           if (prefix->flags & SEXP_FLAG_FIELD) {
+           if (prefix->flags & (SEXP_FLAG_FIELD | SEXP_FLAG_RANGE)) {

                if (parent) {
                    _notmuch_database_log (notmuch, "nested field: '%s' inside '%s'\n",
                                           prefix->name, parent->name);
                if (parent) {
                    _notmuch_database_log (notmuch, "nested field: '%s' inside '%s'\n",
                                           prefix->name, parent->name);


@@ -541,6 +557,10 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent
                return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
            }
 
                return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
            }
 

+           if (strcmp (prefix->name, "date") == 0) {
+               return _sexp_parse_date (notmuch, sx->list->next, output);
+           }
+

            if (strcmp (prefix->name, "infix") == 0) {
                return _sexp_parse_infix (notmuch, sx->list->next, output);
            }
            if (strcmp (prefix->name, "infix") == 0) {
                return _sexp_parse_infix (notmuch, sx->list->next, output);
            }

diff --git a/test/T081-sexpr-search.sh b/test/T081-sexpr-search.sh
index d8f8872ddf528f070973522279ef461e2d6afce3..a6e2ee820c2ce73b7afc6010865a8feb0c834cbd 100755 (executable)
--- a/test/T081-sexpr-search.sh
+++ b/test/T081-sexpr-search.sh
@@ -769,7 +769,6 @@ notmuch search --query=sexp  '(and (infix "date:2009-11-18..2009-11-18") (infix
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "date query, empty"
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "date query, empty"

-test_subtest_known_broken

 notmuch search from:keithp | notmuch_search_sanitize > EXPECTED
 notmuch search --query=sexp  '(and (date) (from keithp))'| notmuch_search_sanitize > OUTPUT
 test_expect_equal_file EXPECTED OUTPUT
 notmuch search from:keithp | notmuch_search_sanitize > EXPECTED
 notmuch search --query=sexp  '(and (date) (from keithp))'| notmuch_search_sanitize > OUTPUT
 test_expect_equal_file EXPECTED OUTPUT


@@ -787,7 +786,6 @@ notmuch search --query=sexp  '(and (date 2009-11-17 2009-11-18) (from keithp))'
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "date query, illegal nesting 1"
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "date query, illegal nesting 1"

-test_subtest_known_broken

 notmuch search --query=sexp '(to (date))' > OUTPUT 2>&1
 cat <<EOF > EXPECTED
 notmuch search: Syntax error in query
 notmuch search --query=sexp '(to (date))' > OUTPUT 2>&1
 cat <<EOF > EXPECTED
 notmuch search: Syntax error in query


@@ -796,7 +794,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "date query, illegal nesting 2"
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "date query, illegal nesting 2"

-test_subtest_known_broken

 notmuch search --query=sexp '(to (date 2021-11-18))' > OUTPUT 2>&1
 cat <<EOF > EXPECTED
 notmuch search: Syntax error in query
 notmuch search --query=sexp '(to (date 2021-11-18))' > OUTPUT 2>&1
 cat <<EOF > EXPECTED
 notmuch search: Syntax error in query