mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-27 03:41:41 +01:00
b90d852a2f
This will be mandatory as of Xapian 1.5. The API is also more consistent with the FieldProcessor API, which helps code re-use a bit. Note that this switches to using the built-in Xapian support for prefixes on ranges (i.e. deleted code at beginning of ParseTimeRangeProcessor::operator(), added prefix to constructor). Another side effect of the migration is that we are generating smaller queries, using one OP_VALUE_RANGE instead of an AND of two OP_VALUE_* queries.
86 lines
2.8 KiB
C++
86 lines
2.8 KiB
C++
/* 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
|
|
* along with this program. If not, see https://www.gnu.org/licenses/ .
|
|
*
|
|
* Author: Jani Nikula <jani@nikula.org>
|
|
*/
|
|
|
|
#include "database-private.h"
|
|
#include "parse-time-vrp.h"
|
|
#include "parse-time-string.h"
|
|
|
|
Xapian::Query
|
|
ParseTimeRangeProcessor::operator() (const std::string &begin, const std::string &end)
|
|
{
|
|
double from = DBL_MIN, to = DBL_MAX;
|
|
time_t parsed_time, now;
|
|
std::string str;
|
|
|
|
/* Use the same 'now' for begin and end. */
|
|
if (time (&now) == (time_t) -1)
|
|
throw Xapian::QueryParserError ("unable to get current time");
|
|
|
|
if (!begin.empty ()) {
|
|
if (parse_time_string (begin.c_str (), &parsed_time, &now, PARSE_TIME_ROUND_DOWN))
|
|
throw Xapian::QueryParserError ("Didn't understand date specification '" + begin + "'");
|
|
else
|
|
from = (double) parsed_time;
|
|
}
|
|
|
|
if (!end.empty ()) {
|
|
if (end == "!" && ! begin.empty ())
|
|
str = begin;
|
|
else
|
|
str = end;
|
|
|
|
if (parse_time_string (str.c_str (), &parsed_time, &now, PARSE_TIME_ROUND_UP_INCLUSIVE))
|
|
throw Xapian::QueryParserError ("Didn't understand date specification '" + str + "'");
|
|
else
|
|
to = (double) parsed_time;
|
|
}
|
|
|
|
return Xapian::Query (Xapian::Query::OP_VALUE_RANGE, slot,
|
|
Xapian::sortable_serialise (from),
|
|
Xapian::sortable_serialise (to));
|
|
}
|
|
|
|
/* XXX TODO: is throwing an exception the right thing to do here? */
|
|
Xapian::Query
|
|
DateFieldProcessor::operator() (const std::string & str)
|
|
{
|
|
double from = DBL_MIN, to = DBL_MAX;
|
|
time_t parsed_time, now;
|
|
|
|
/* Use the same 'now' for begin and end. */
|
|
if (time (&now) == (time_t) -1)
|
|
throw Xapian::QueryParserError ("Unable to get current time");
|
|
|
|
if (parse_time_string (str.c_str (), &parsed_time, &now, PARSE_TIME_ROUND_DOWN))
|
|
throw Xapian::QueryParserError ("Didn't understand date specification '" + str + "'");
|
|
else
|
|
from = (double) parsed_time;
|
|
|
|
if (parse_time_string (str.c_str (), &parsed_time, &now, PARSE_TIME_ROUND_UP_INCLUSIVE))
|
|
throw Xapian::QueryParserError ("Didn't understand date specification '" + str + "'");
|
|
else
|
|
to = (double) parsed_time;
|
|
|
|
return Xapian::Query (Xapian::Query::OP_VALUE_RANGE, slot,
|
|
Xapian::sortable_serialise (from),
|
|
Xapian::sortable_serialise (to));
|
|
}
|