X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fparse-time-vrp.cc;h=168d58106db6e700bdf414cab1b120cb9cb49f75;hb=38bd0df922aa1c9ac98154f6d3dc3e30255ad47e;hp=dd69149423072f396cbc096cfd10ab53c1e79087;hpb=c3a683299d4c27d6eadaacf4fb516f73a6c69fc3;p=notmuch

diff --git a/lib/parse-time-vrp.cc b/lib/parse-time-vrp.cc
index dd691494..168d5810 100644
--- a/lib/parse-time-vrp.cc
+++ b/lib/parse-time-vrp.cc
@@ -45,14 +45,14 @@ ParseTimeValueRangeProcessor::operator() (std::string &begin, std::string &end)
     if (time (&now) == (time_t) -1)
 	return Xapian::BAD_VALUENO;
 
-    if (!begin.empty ()) {
+    if (! begin.empty ()) {
 	if (parse_time_string (begin.c_str (), &t, &now, PARSE_TIME_ROUND_DOWN))
 	    return Xapian::BAD_VALUENO;
 
 	begin.assign (Xapian::sortable_serialise ((double) t));
     }
 
-    if (!end.empty ()) {
+    if (! end.empty ()) {
 	if (end == "!" && ! b.empty ())
 	    end = b;
 
@@ -65,14 +65,15 @@ ParseTimeValueRangeProcessor::operator() (std::string &begin, std::string &end)
     return valno;
 }
 
-#if HAVE_XAPIAN_FIELD_PROCESSOR
 /* XXX TODO: is throwing an exception the right thing to do here? */
-Xapian::Query DateFieldProcessor::operator()(const std::string & str) {
+Xapian::Query
+DateFieldProcessor::operator() (const std::string & str)
+{
     time_t from, to, now;
 
     /* Use the same 'now' for begin and end. */
     if (time (&now) == (time_t) -1)
-	throw Xapian::QueryParserError("Unable to get current time");
+	throw Xapian::QueryParserError ("Unable to get current time");
 
     if (parse_time_string (str.c_str (), &from, &now, PARSE_TIME_ROUND_DOWN))
 	throw Xapian::QueryParserError ("Didn't understand date specification '" + str + "'");
@@ -80,8 +81,7 @@ Xapian::Query DateFieldProcessor::operator()(const std::string & str) {
     if (parse_time_string (str.c_str (), &to, &now, PARSE_TIME_ROUND_UP_INCLUSIVE))
 	throw Xapian::QueryParserError ("Didn't understand date specification '" + str + "'");
 
-    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_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)));
 }
-#endif