#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)
+notmuch_status_t
+_notmuch_date_strings_to_query (Xapian::valueno slot,
+ const std::string &begin, const std::string &end,
+ Xapian::Query &output, std::string &msg)
{
- time_t t, now;
- std::string b;
-
- /* 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);
- b = begin;
+ 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)
- return Xapian::BAD_VALUENO;
+ if (time (&now) == (time_t) -1) {
+ msg = "unable to get current time";
+ return NOTMUCH_STATUS_ILLEGAL_ARGUMENT;
+ }
if (! begin.empty ()) {
- if (parse_time_string (begin.c_str (), &t, &now, PARSE_TIME_ROUND_DOWN))
- return Xapian::BAD_VALUENO;
+ if (parse_time_string (begin.c_str (), &parsed_time, &now, PARSE_TIME_ROUND_DOWN)) {
+ msg = "Didn't understand date specification '" + begin + "'";
+ return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
+ }
- begin.assign (Xapian::sortable_serialise ((double) t));
+ from = (double) parsed_time;
}
if (! end.empty ()) {
- if (end == "!" && ! b.empty ())
- end = b;
+ if (end == "!" && ! begin.empty ())
+ str = begin;
+ else
+ str = end;
+
+ if (parse_time_string (str.c_str (), &parsed_time, &now, PARSE_TIME_ROUND_UP_INCLUSIVE)) {
+ msg = "Didn't understand date specification '" + str + "'";
+ return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
+ }
+ to = (double) parsed_time;
+ }
- if (parse_time_string (end.c_str (), &t, &now, PARSE_TIME_ROUND_UP_INCLUSIVE))
- return Xapian::BAD_VALUENO;
+ output = Xapian::Query (Xapian::Query::OP_VALUE_RANGE, slot,
+ Xapian::sortable_serialise (from),
+ Xapian::sortable_serialise (to));
+ return NOTMUCH_STATUS_SUCCESS;
+}
- end.assign (Xapian::sortable_serialise ((double) t));
- }
+Xapian::Query
+ParseTimeRangeProcessor::operator() (const std::string &begin, const std::string &end)
+{
+
+ Xapian::Query output;
+ std::string msg;
+
+ if (_notmuch_date_strings_to_query (slot, begin, end, output, msg))
+ throw Xapian::QueryParserError (msg);
- return valno;
+ return output;
}
/* XXX TODO: is throwing an exception the right thing to do here? */
Xapian::Query
DateFieldProcessor::operator() (const std::string & str)
{
- time_t from, to, now;
+ 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 (), &from, &now, PARSE_TIME_ROUND_DOWN))
+ 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 (), &to, &now, PARSE_TIME_ROUND_UP_INCLUSIVE))
+ 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_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)));
+ return Xapian::Query (Xapian::Query::OP_VALUE_RANGE, slot,
+ Xapian::sortable_serialise (from),
+ Xapian::sortable_serialise (to));
}