debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-27 05:07:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/date: factor out date range parsing.

Browse source 
This will allow re-using the same logic in the s-expression parser.
This commit is contained in:
David Bremner 2022-01-20 09:36:02 -04:00
parent 303f207a54
commit bf3cc5eed2
2 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/database-private.h
View file

@ -379,5 +379,10 @@ notmuch_status_t
_notmuch_sexp_string_to_xapian_query (notmuch_database_t *notmuch, const char *querystr, _notmuch_sexp_string_to_xapian_query (notmuch_database_t *notmuch, const char *querystr,
Xapian::Query &output); Xapian::Query &output);
#endif #endif
/* parse-time-vrp.h */
notmuch_status_t
_notmuch_date_strings_to_query (Xapian::valueno slot, const std::string &from, const std::string &to,
Xapian::Query &output, std::string &msg);
#endif #endif
#endif #endif

43
lib/parse-time-vrp.cc
View file

@ -24,21 +24,27 @@
#include "parse-time-vrp.h" #include "parse-time-vrp.h"
#include "parse-time-string.h" #include "parse-time-string.h"
Xapian::Query notmuch_status_t
ParseTimeRangeProcessor::operator() (const std::string &begin, const std::string &end) _notmuch_date_strings_to_query (Xapian::valueno slot,
const std::string &begin, const std::string &end,
Xapian::Query &output, std::string &msg)
{ {
double from = DBL_MIN, to = DBL_MAX; double from = DBL_MIN, to = DBL_MAX;
time_t parsed_time, now; time_t parsed_time, now;
std::string str; std::string str;
/* Use the same 'now' for begin and end. */ /* Use the same 'now' for begin and end. */
if (time (&now) == (time_t) -1) if (time (&now) == (time_t) -1) {
throw Xapian::QueryParserError ("unable to get current time"); msg = "unable to get current time";
return NOTMUCH_STATUS_ILLEGAL_ARGUMENT;
}
if (! begin.empty ()) { if (! begin.empty ()) {
if (parse_time_string (begin.c_str (), &parsed_time, &now, PARSE_TIME_ROUND_DOWN)) if (parse_time_string (begin.c_str (), &parsed_time, &now, PARSE_TIME_ROUND_DOWN)) {
throw Xapian::QueryParserError ("Didn't understand date specification '" + begin + "'"); msg = "Didn't understand date specification '" + begin + "'";
else return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
}
from = (double) parsed_time; from = (double) parsed_time;
} }
@ -48,15 +54,30 @@ ParseTimeRangeProcessor::operator() (const std::string &begin, const std::string
else else
str = end; str = end;
if (parse_time_string (str.c_str (), &parsed_time, &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 + "'"); msg = "Didn't understand date specification '" + str + "'";
else return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
}
to = (double) parsed_time; to = (double) parsed_time;
} }
return Xapian::Query (Xapian::Query::OP_VALUE_RANGE, slot, output = Xapian::Query (Xapian::Query::OP_VALUE_RANGE, slot,
Xapian::sortable_serialise (from), Xapian::sortable_serialise (from),
Xapian::sortable_serialise (to)); Xapian::sortable_serialise (to));
return NOTMUCH_STATUS_SUCCESS;
}
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 output;
} }
/* XXX TODO: is throwing an exception the right thing to do here? */ /* XXX TODO: is throwing an exception the right thing to do here? */