This particular choice of converting strings to integers requires C++11.
---
lib/parse-sexp.cc | 38 +++++++++++++++++++++++++++++++++++---
test/T081-sexpr-search.sh | 11 -----------
2 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc
index fa88071e..06825dc4 100644
--- a/lib/parse-sexp.cc
+++ b/lib/parse-sexp.cc
@@ -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,
@@ -454,7 +456,7 @@ _sexp_parse_range (notmuch_database_t *notmuch, const
_sexp_prefix_t *prefix,
const sexp_t *sx, Xapian::Query &output)
{
const char *from, *to;
- std::string msg; /* ignored */
+ std::string msg;
/* empty range matches everything */
if (! sx) {
@@ -485,8 +487,38 @@ _sexp_parse_range (notmuch_database_t *notmuch, const
_sexp_prefix_t *prefix,
to = sx->next->val;
}
- if (strcmp (prefix->name, "date") == 0)
- return _notmuch_date_strings_to_query (NOTMUCH_VALUE_TIMESTAMP, from,
to, output, msg);
+ 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;
+ }
+
+ 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;
diff --git a/test/T081-sexpr-search.sh b/test/T081-sexpr-search.sh
index 0b4ecf8e..73f45041 100755
--- a/test/T081-sexpr-search.sh
+++ b/test/T081-sexpr-search.sh
@@ -824,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
@@ -833,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.3060...@april.org id:4efc743a.3060...@april.org
revision=$(notmuch count --lastmod '*' | cut -f3)
notmuch search lastmod:$revision..$revision | notmuch_search_sanitize >
EXPECTED
@@ -847,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
@@ -855,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
@@ -864,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
@@ -873,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
@@ -882,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
@@ -891,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
@@ -900,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
@@ -909,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
--
2.34.1
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org
