lib: add date range query support
Add a custom value range processor to enable date and time searches of
the form date:since..until, where "since" and "until" are expressions
understood by the previously added date/time parser, to restrict the
results to messages within a particular time range (based on the Date:
header).
If "since" or "until" describes date/time at an accuracy of days or
less, the values are rounded according to the accuracy, towards past
for "since" and towards future for "until". For example,
date:november..yesterday would match from the beginning of November
until the end of yesterday. Expressions such as date:today..today
means since the beginning of today until the end of today.
Open-ended ranges are supported (since Xapian 1.2.1), i.e. you can
specify date:..until or date:since.. to not limit the start or end
date, respectively.
CAVEATS:
Xapian does 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.
Entering date:expr without ".." (for example date:yesterday) will not
work as you might expect. You can achieve the expected result by
duplicating the expr both sides of ".." (for example
date:yesterday..yesterday).
Open-ended ranges won't work with pre-1.2.1 Xapian, but they don't
produce an error either.
Signed-off-by: Jani Nikula <jani@nikula.org>
2012-10-30 21:32:37 +01:00
|
|
|
/* parse-time-vrp.cc - date range query glue
|
|
|
|
*
|
|
|
|
* This file is part of notmuch.
|
|
|
|
*
|
|
|
|
* Copyright © 2012 Jani Nikula
|
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2016-06-02 18:26:14 +02:00
|
|
|
* along with this program. If not, see https://www.gnu.org/licenses/ .
|
lib: add date range query support
Add a custom value range processor to enable date and time searches of
the form date:since..until, where "since" and "until" are expressions
understood by the previously added date/time parser, to restrict the
results to messages within a particular time range (based on the Date:
header).
If "since" or "until" describes date/time at an accuracy of days or
less, the values are rounded according to the accuracy, towards past
for "since" and towards future for "until". For example,
date:november..yesterday would match from the beginning of November
until the end of yesterday. Expressions such as date:today..today
means since the beginning of today until the end of today.
Open-ended ranges are supported (since Xapian 1.2.1), i.e. you can
specify date:..until or date:since.. to not limit the start or end
date, respectively.
CAVEATS:
Xapian does 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.
Entering date:expr without ".." (for example date:yesterday) will not
work as you might expect. You can achieve the expected result by
duplicating the expr both sides of ".." (for example
date:yesterday..yesterday).
Open-ended ranges won't work with pre-1.2.1 Xapian, but they don't
produce an error either.
Signed-off-by: Jani Nikula <jani@nikula.org>
2012-10-30 21:32:37 +01:00
|
|
|
*
|
|
|
|
* Author: Jani Nikula <jani@nikula.org>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "database-private.h"
|
|
|
|
#include "parse-time-vrp.h"
|
|
|
|
#include "parse-time-string.h"
|
|
|
|
|
|
|
|
#define PREFIX "date:"
|
|
|
|
|
|
|
|
/* See *ValueRangeProcessor in xapian-core/api/valuerangeproc.cc */
|
|
|
|
Xapian::valueno
|
|
|
|
ParseTimeValueRangeProcessor::operator() (std::string &begin, std::string &end)
|
|
|
|
{
|
|
|
|
time_t t, now;
|
2015-08-15 13:25:47 +02:00
|
|
|
std::string b;
|
lib: add date range query support
Add a custom value range processor to enable date and time searches of
the form date:since..until, where "since" and "until" are expressions
understood by the previously added date/time parser, to restrict the
results to messages within a particular time range (based on the Date:
header).
If "since" or "until" describes date/time at an accuracy of days or
less, the values are rounded according to the accuracy, towards past
for "since" and towards future for "until". For example,
date:november..yesterday would match from the beginning of November
until the end of yesterday. Expressions such as date:today..today
means since the beginning of today until the end of today.
Open-ended ranges are supported (since Xapian 1.2.1), i.e. you can
specify date:..until or date:since.. to not limit the start or end
date, respectively.
CAVEATS:
Xapian does 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.
Entering date:expr without ".." (for example date:yesterday) will not
work as you might expect. You can achieve the expected result by
duplicating the expr both sides of ".." (for example
date:yesterday..yesterday).
Open-ended ranges won't work with pre-1.2.1 Xapian, but they don't
produce an error either.
Signed-off-by: Jani Nikula <jani@nikula.org>
2012-10-30 21:32:37 +01:00
|
|
|
|
|
|
|
/* Require date: prefix in start of the range... */
|
|
|
|
if (STRNCMP_LITERAL (begin.c_str (), PREFIX))
|
|
|
|
return Xapian::BAD_VALUENO;
|
|
|
|
|
|
|
|
/* ...and remove it. */
|
|
|
|
begin.erase (0, sizeof (PREFIX) - 1);
|
2015-08-15 13:25:47 +02:00
|
|
|
b = begin;
|
lib: add date range query support
Add a custom value range processor to enable date and time searches of
the form date:since..until, where "since" and "until" are expressions
understood by the previously added date/time parser, to restrict the
results to messages within a particular time range (based on the Date:
header).
If "since" or "until" describes date/time at an accuracy of days or
less, the values are rounded according to the accuracy, towards past
for "since" and towards future for "until". For example,
date:november..yesterday would match from the beginning of November
until the end of yesterday. Expressions such as date:today..today
means since the beginning of today until the end of today.
Open-ended ranges are supported (since Xapian 1.2.1), i.e. you can
specify date:..until or date:since.. to not limit the start or end
date, respectively.
CAVEATS:
Xapian does 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.
Entering date:expr without ".." (for example date:yesterday) will not
work as you might expect. You can achieve the expected result by
duplicating the expr both sides of ".." (for example
date:yesterday..yesterday).
Open-ended ranges won't work with pre-1.2.1 Xapian, but they don't
produce an error either.
Signed-off-by: Jani Nikula <jani@nikula.org>
2012-10-30 21:32:37 +01:00
|
|
|
|
|
|
|
/* Use the same 'now' for begin and end. */
|
|
|
|
if (time (&now) == (time_t) -1)
|
|
|
|
return Xapian::BAD_VALUENO;
|
|
|
|
|
2019-06-13 12:55:35 +02:00
|
|
|
if (! begin.empty ()) {
|
lib: add date range query support
Add a custom value range processor to enable date and time searches of
the form date:since..until, where "since" and "until" are expressions
understood by the previously added date/time parser, to restrict the
results to messages within a particular time range (based on the Date:
header).
If "since" or "until" describes date/time at an accuracy of days or
less, the values are rounded according to the accuracy, towards past
for "since" and towards future for "until". For example,
date:november..yesterday would match from the beginning of November
until the end of yesterday. Expressions such as date:today..today
means since the beginning of today until the end of today.
Open-ended ranges are supported (since Xapian 1.2.1), i.e. you can
specify date:..until or date:since.. to not limit the start or end
date, respectively.
CAVEATS:
Xapian does 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.
Entering date:expr without ".." (for example date:yesterday) will not
work as you might expect. You can achieve the expected result by
duplicating the expr both sides of ".." (for example
date:yesterday..yesterday).
Open-ended ranges won't work with pre-1.2.1 Xapian, but they don't
produce an error either.
Signed-off-by: Jani Nikula <jani@nikula.org>
2012-10-30 21:32:37 +01:00
|
|
|
if (parse_time_string (begin.c_str (), &t, &now, PARSE_TIME_ROUND_DOWN))
|
|
|
|
return Xapian::BAD_VALUENO;
|
|
|
|
|
|
|
|
begin.assign (Xapian::sortable_serialise ((double) t));
|
|
|
|
}
|
|
|
|
|
2019-06-13 12:55:35 +02:00
|
|
|
if (! end.empty ()) {
|
2015-08-15 13:25:47 +02:00
|
|
|
if (end == "!" && ! b.empty ())
|
|
|
|
end = b;
|
|
|
|
|
lib: add date range query support
Add a custom value range processor to enable date and time searches of
the form date:since..until, where "since" and "until" are expressions
understood by the previously added date/time parser, to restrict the
results to messages within a particular time range (based on the Date:
header).
If "since" or "until" describes date/time at an accuracy of days or
less, the values are rounded according to the accuracy, towards past
for "since" and towards future for "until". For example,
date:november..yesterday would match from the beginning of November
until the end of yesterday. Expressions such as date:today..today
means since the beginning of today until the end of today.
Open-ended ranges are supported (since Xapian 1.2.1), i.e. you can
specify date:..until or date:since.. to not limit the start or end
date, respectively.
CAVEATS:
Xapian does 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.
Entering date:expr without ".." (for example date:yesterday) will not
work as you might expect. You can achieve the expected result by
duplicating the expr both sides of ".." (for example
date:yesterday..yesterday).
Open-ended ranges won't work with pre-1.2.1 Xapian, but they don't
produce an error either.
Signed-off-by: Jani Nikula <jani@nikula.org>
2012-10-30 21:32:37 +01:00
|
|
|
if (parse_time_string (end.c_str (), &t, &now, PARSE_TIME_ROUND_UP_INCLUSIVE))
|
|
|
|
return Xapian::BAD_VALUENO;
|
|
|
|
|
|
|
|
end.assign (Xapian::sortable_serialise ((double) t));
|
|
|
|
}
|
|
|
|
|
|
|
|
return valno;
|
|
|
|
}
|
2016-03-22 11:54:44 +01:00
|
|
|
|
|
|
|
/* XXX TODO: is throwing an exception the right thing to do here? */
|
2019-06-13 12:55:35 +02:00
|
|
|
Xapian::Query
|
|
|
|
DateFieldProcessor::operator() (const std::string & str)
|
|
|
|
{
|
2016-03-22 11:54:44 +01:00
|
|
|
time_t from, to, now;
|
|
|
|
|
|
|
|
/* Use the same 'now' for begin and end. */
|
|
|
|
if (time (&now) == (time_t) -1)
|
2019-06-13 12:55:35 +02:00
|
|
|
throw Xapian::QueryParserError ("Unable to get current time");
|
2016-03-22 11:54:44 +01:00
|
|
|
|
|
|
|
if (parse_time_string (str.c_str (), &from, &now, PARSE_TIME_ROUND_DOWN))
|
|
|
|
throw Xapian::QueryParserError ("Didn't understand date specification '" + str + "'");
|
|
|
|
|
|
|
|
if (parse_time_string (str.c_str (), &to, &now, PARSE_TIME_ROUND_UP_INCLUSIVE))
|
|
|
|
throw Xapian::QueryParserError ("Didn't understand date specification '" + str + "'");
|
|
|
|
|
2019-06-13 12:55:35 +02:00
|
|
|
return Xapian::Query (Xapian::Query::OP_AND,
|
|
|
|
Xapian::Query (Xapian::Query::OP_VALUE_GE, 0, Xapian::sortable_serialise ((double) from)),
|
|
|
|
Xapian::Query (Xapian::Query::OP_VALUE_LE, 0, Xapian::sortable_serialise ((double) to)));
|
2016-03-22 11:54:44 +01:00
|
|
|
}
|