From 23b8ed610a13802f0afa5fa70bc8faa04cf48a7f Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sat, 15 Aug 2015 14:25:47 +0300 Subject: [PATCH] lib: add support for date:..! to mean date:.. It doesn't seem likely we can support simple date: expanding to date:.. any time soon. (This can be done with a future version of Xapian, or with a custom query query parser.) In the mean time, provide shorthand date:..! to mean the same. This is useful, as the expansion takes place before interpetation, and we can use, for example, date:yesterday..! to match from beginning of yesterday to end of yesterday. Idea from Mark Walters . --- doc/man7/notmuch-search-terms.rst | 12 +++++++----- lib/parse-time-vrp.cc | 5 +++++ test/T500-search-date.sh | 4 ++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/doc/man7/notmuch-search-terms.rst b/doc/man7/notmuch-search-terms.rst index e71a5255..11a3da3d 100644 --- a/doc/man7/notmuch-search-terms.rst +++ b/doc/man7/notmuch-search-terms.rst @@ -278,6 +278,13 @@ In this case, is taken as the earliest time it could describe could describe (the end of yesterday). Similarly, date:january..february matches from the beginning of January to the end of February. +date:..! can be used as a shorthand for date:... The +expansion takes place before interpretation, and thus, for example, +date:monday..! matches from the beginning of Monday until the end of +Monday. (Note that entering date: without "..", for example +date:yesterday, won't work, as it's not interpreted as a range +expression at all. Again, use date:yesterday..!) + Currently, we do not support spaces in range expressions. You can replace the spaces with '\_', or (in most cases) '-', or (in some cases) leave the spaces out altogether. Examples in this man page use spaces @@ -288,11 +295,6 @@ to specify date:.. or date:.. to not limit the start or end time, respectively. Pre-1.2.1 Xapian does not report an error on open ended ranges, but it does not work as expected either. -Entering date:expr without ".." (for example date:yesterday) won't work, -as it's not interpreted as a range expression at all. You can achieve -the expected result by duplicating the expr both sides of ".." (for -example date:yesterday..yesterday). - Relative date and time ---------------------- diff --git a/lib/parse-time-vrp.cc b/lib/parse-time-vrp.cc index 33f07db3..03804cf5 100644 --- a/lib/parse-time-vrp.cc +++ b/lib/parse-time-vrp.cc @@ -31,6 +31,7 @@ Xapian::valueno ParseTimeValueRangeProcessor::operator() (std::string &begin, std::string &end) { time_t t, now; + std::string b; /* Require date: prefix in start of the range... */ if (STRNCMP_LITERAL (begin.c_str (), PREFIX)) @@ -38,6 +39,7 @@ ParseTimeValueRangeProcessor::operator() (std::string &begin, std::string &end) /* ...and remove it. */ begin.erase (0, sizeof (PREFIX) - 1); + b = begin; /* Use the same 'now' for begin and end. */ if (time (&now) == (time_t) -1) @@ -51,6 +53,9 @@ ParseTimeValueRangeProcessor::operator() (std::string &begin, std::string &end) } if (!end.empty ()) { + if (end == "!" && ! b.empty ()) + end = b; + if (parse_time_string (end.c_str (), &t, &now, PARSE_TIME_ROUND_UP_INCLUSIVE)) return Xapian::BAD_VALUENO; diff --git a/test/T500-search-date.sh b/test/T500-search-date.sh index b28496b7..f5cea421 100755 --- a/test/T500-search-date.sh +++ b/test/T500-search-date.sh @@ -8,6 +8,10 @@ test_begin_subtest "Absolute date range" output=$(notmuch search date:2010-12-16..12/16/2010 | notmuch_search_sanitize) test_expect_equal "$output" "thread:XXX 2010-12-16 [1/1] Olivier Berger; Essai accentué (inbox unread)" +test_begin_subtest "Absolute date range with 'same' operator" +output=$(notmuch search date:2010-12-16..! | notmuch_search_sanitize) +test_expect_equal "$output" "thread:XXX 2010-12-16 [1/1] Olivier Berger; Essai accentué (inbox unread)" + test_begin_subtest "Absolute time range with TZ" notmuch search date:18-Nov-2009_02:19:26-0800..2009-11-18_04:49:52-06:00 | notmuch_search_sanitize > OUTPUT cat <EXPECTED -- 2.26.2