lib/parse-sexp: handle lastmod queries.
authorDavid Bremner <david@tethera.net>
Thu, 20 Jan 2022 13:36:05 +0000 (09:36 -0400)
committerDavid Bremner <david@tethera.net>
Wed, 26 Jan 2022 11:41:02 +0000 (07:41 -0400)
This particular choice of converting strings to integers requires C++11.

lib/parse-sexp.cc
test/T081-sexpr-search.sh

index dbc3f89d903305969dccc2752582b97d3c45f74a..06825dc477377d3b4570a760abffce8d626cfe0c 100644 (file)
@@ -79,6 +79,8 @@ static _sexp_prefix_t prefixes[] =
       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 },
+    { "lastmod",           Xapian::Query::OP_INVALID,      Xapian::Query::MatchAll,
+      SEXP_FLAG_RANGE },
     { "matching",       Xapian::Query::OP_AND,          Xapian::Query::MatchAll,
       SEXP_FLAG_DO_EXPAND },
     { "mid",            Xapian::Query::OP_OR,           Xapian::Query::MatchNothing,
@@ -495,6 +497,29 @@ _sexp_parse_range (notmuch_database_t *notmuch,  const _sexp_prefix_t *prefix,
        return status;
     }
 
+    if (strcmp (prefix->name, "lastmod") == 0) {
+       long from_idx, to_idx;
+
+       try {
+           from_idx = std::stol (from);
+       } catch (std::logic_error &e) {
+           _notmuch_database_log (notmuch, "bad 'from' revision: '%s'\n", from);
+           return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
+       }
+
+       try {
+           to_idx = std::stol (to);
+       } catch (std::logic_error &e) {
+           _notmuch_database_log (notmuch, "bad 'to' revision: '%s'\n", to);
+           return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
+       }
+
+       output = Xapian::Query (Xapian::Query::OP_VALUE_RANGE, NOTMUCH_VALUE_LAST_MOD,
+                               Xapian::sortable_serialise (from_idx),
+                               Xapian::sortable_serialise (to_idx));
+       return NOTMUCH_STATUS_SUCCESS;
+    }
+
     _notmuch_database_log (notmuch, "unimplimented range prefix: '%s'\n", prefix->name);
     return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
 }
index 4231dd386d9b17671e0d818bbccf936edb609f6f..73f45041c0495485af56dc710b0d30766d453a70 100755 (executable)
@@ -832,13 +832,11 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "lastmod query, empty"
-test_subtest_known_broken
 notmuch search from:keithp | notmuch_search_sanitize > EXPECTED
 notmuch search --query=sexp  '(and (lastmod) (from keithp))'| notmuch_search_sanitize > OUTPUT
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "lastmod query, one argument"
-test_subtest_known_broken
 notmuch tag +4EFC743A.3060609@april.org id:4EFC743A.3060609@april.org
 revision=$(notmuch count --lastmod '*' | cut -f3)
 notmuch search lastmod:$revision..$revision | notmuch_search_sanitize > EXPECTED
@@ -846,7 +844,6 @@ notmuch search --query=sexp  "(and (lastmod $revision))" | notmuch_search_saniti
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "lastmod query, two arguments"
-test_subtest_known_broken
 notmuch tag +keithp from:keithp
 revision2=$(notmuch count --lastmod '*' | cut -f3)
 notmuch search lastmod:$revision..$revision2 | notmuch_search_sanitize > EXPECTED
@@ -854,7 +851,6 @@ notmuch search --query=sexp  "(and (lastmod $revision $revision2))" | notmuch_se
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "lastmod query, illegal nesting 1"
-test_subtest_known_broken
 notmuch search --query=sexp '(to (lastmod))' > OUTPUT 2>&1
 cat <<EOF > EXPECTED
 notmuch search: Syntax error in query
@@ -863,7 +859,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "lastmod query, bad from revision"
-test_subtest_known_broken
 notmuch search --query=sexp '(lastmod apples)' > OUTPUT 2>&1
 cat <<EOF > EXPECTED
 notmuch search: Syntax error in query
@@ -872,7 +867,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "lastmod query, bad to revision"
-test_subtest_known_broken
 notmuch search --query=sexp '(lastmod 0 apples)' > OUTPUT 2>&1
 cat <<EOF > EXPECTED
 notmuch search: Syntax error in query
@@ -881,7 +875,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "lastmod query, illegal nesting 2"
-test_subtest_known_broken
 notmuch search --query=sexp '(to (lastmod 2021-11-18))' > OUTPUT 2>&1
 cat <<EOF > EXPECTED
 notmuch search: Syntax error in query
@@ -890,7 +883,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "lastmod query, illegal nesting 3"
-test_subtest_known_broken
 notmuch search --query=sexp '(lastmod (to))' > OUTPUT 2>&1
 cat <<EOF > EXPECTED
 notmuch search: Syntax error in query
@@ -899,7 +891,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "lastmod query, illegal nesting 4"
-test_subtest_known_broken
 notmuch search --query=sexp '(lastmod today (to))' > OUTPUT 2>&1
 cat <<EOF > EXPECTED
 notmuch search: Syntax error in query
@@ -908,7 +899,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "lastmod query, too many arguments"
-test_subtest_known_broken
 notmuch search --query=sexp '(lastmod yesterday and tommorow)' > OUTPUT 2>&1
 cat <<EOF > EXPECTED
 notmuch search: Syntax error in query