debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-28 13:44:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/parse-sexp: handle lastmod queries.

Browse source 
This particular choice of converting strings to integers requires C++11.
This commit is contained in:
David Bremner 2022-01-20 09:36:05 -04:00
parent 341016c8ec
commit 0a32741fce
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/parse-sexp.cc
View file

@ -79,6 +79,8 @@ static _sexp_prefix_t prefixes[] =
SEXP_FLAG_SINGLE | SEXP_FLAG_ORPHAN }, SEXP_FLAG_SINGLE | SEXP_FLAG_ORPHAN },
{ "is", Xapian::Query::OP_AND, Xapian::Query::MatchAll, { "is", Xapian::Query::OP_AND, Xapian::Query::MatchAll,
SEXP_FLAG_FIELD | SEXP_FLAG_BOOLEAN | SEXP_FLAG_WILDCARD | SEXP_FLAG_REGEX | SEXP_FLAG_EXPAND }, 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, { "matching", Xapian::Query::OP_AND, Xapian::Query::MatchAll,
SEXP_FLAG_DO_EXPAND }, SEXP_FLAG_DO_EXPAND },
{ "mid", Xapian::Query::OP_OR, Xapian::Query::MatchNothing, { "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; 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); _notmuch_database_log (notmuch, "unimplimented range prefix: '%s'\n", prefix->name);
return NOTMUCH_STATUS_BAD_QUERY_SYNTAX; return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
} }

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

@ -832,13 +832,11 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "lastmod query, empty" test_begin_subtest "lastmod query, empty"
test_subtest_known_broken
notmuch search from:keithp | notmuch_search_sanitize > EXPECTED notmuch search from:keithp | notmuch_search_sanitize > EXPECTED
notmuch search --query=sexp '(and (lastmod) (from keithp))'| notmuch_search_sanitize > OUTPUT notmuch search --query=sexp '(and (lastmod) (from keithp))'| notmuch_search_sanitize > OUTPUT
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "lastmod query, one argument" test_begin_subtest "lastmod query, one argument"
test_subtest_known_broken
notmuch tag +4EFC743A.3060609@april.org id:4EFC743A.3060609@april.org notmuch tag +4EFC743A.3060609@april.org id:4EFC743A.3060609@april.org
revision=$(notmuch count --lastmod '*' | cut -f3) revision=$(notmuch count --lastmod '*' | cut -f3)
notmuch search lastmod:$revision..$revision | notmuch_search_sanitize > EXPECTED 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_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "lastmod query, two arguments" test_begin_subtest "lastmod query, two arguments"
test_subtest_known_broken
notmuch tag +keithp from:keithp notmuch tag +keithp from:keithp
revision2=$(notmuch count --lastmod '*' | cut -f3) revision2=$(notmuch count --lastmod '*' | cut -f3)
notmuch search lastmod:$revision..$revision2 | notmuch_search_sanitize > EXPECTED 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_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "lastmod query, illegal nesting 1" test_begin_subtest "lastmod query, illegal nesting 1"
test_subtest_known_broken
notmuch search --query=sexp '(to (lastmod))' > OUTPUT 2>&1 notmuch search --query=sexp '(to (lastmod))' > OUTPUT 2>&1
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
notmuch search: Syntax error in query notmuch search: Syntax error in query
@ -863,7 +859,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "lastmod query, bad from revision" test_begin_subtest "lastmod query, bad from revision"
test_subtest_known_broken
notmuch search --query=sexp '(lastmod apples)' > OUTPUT 2>&1 notmuch search --query=sexp '(lastmod apples)' > OUTPUT 2>&1
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
notmuch search: Syntax error in query notmuch search: Syntax error in query
@ -872,7 +867,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "lastmod query, bad to revision" test_begin_subtest "lastmod query, bad to revision"
test_subtest_known_broken
notmuch search --query=sexp '(lastmod 0 apples)' > OUTPUT 2>&1 notmuch search --query=sexp '(lastmod 0 apples)' > OUTPUT 2>&1
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
notmuch search: Syntax error in query notmuch search: Syntax error in query
@ -881,7 +875,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "lastmod query, illegal nesting 2" test_begin_subtest "lastmod query, illegal nesting 2"
test_subtest_known_broken
notmuch search --query=sexp '(to (lastmod 2021-11-18))' > OUTPUT 2>&1 notmuch search --query=sexp '(to (lastmod 2021-11-18))' > OUTPUT 2>&1
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
notmuch search: Syntax error in query notmuch search: Syntax error in query
@ -890,7 +883,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "lastmod query, illegal nesting 3" test_begin_subtest "lastmod query, illegal nesting 3"
test_subtest_known_broken
notmuch search --query=sexp '(lastmod (to))' > OUTPUT 2>&1 notmuch search --query=sexp '(lastmod (to))' > OUTPUT 2>&1
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
notmuch search: Syntax error in query notmuch search: Syntax error in query
@ -899,7 +891,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "lastmod query, illegal nesting 4" test_begin_subtest "lastmod query, illegal nesting 4"
test_subtest_known_broken
notmuch search --query=sexp '(lastmod today (to))' > OUTPUT 2>&1 notmuch search --query=sexp '(lastmod today (to))' > OUTPUT 2>&1
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
notmuch search: Syntax error in query notmuch search: Syntax error in query
@ -908,7 +899,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "lastmod query, too many arguments" test_begin_subtest "lastmod query, too many arguments"
test_subtest_known_broken
notmuch search --query=sexp '(lastmod yesterday and tommorow)' > OUTPUT 2>&1 notmuch search --query=sexp '(lastmod yesterday and tommorow)' > OUTPUT 2>&1
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
notmuch search: Syntax error in query notmuch search: Syntax error in query