X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fdatabase.cc;h=96300008765e445f146ec2b3ce93b03df792b1cf;hb=b9bf3f44eacd42ce53885c79f9dad8d82c76f13d;hp=3b342f136a5397b32096987d0ad3592c43e4fc63;hpb=bceb6516cee170d3ad4b620826d48e90f05a12b1;p=notmuch

diff --git a/lib/database.cc b/lib/database.cc
index 3b342f13..96300008 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -20,6 +20,7 @@
 
 #include "database-private.h"
 #include "parse-time-vrp.h"
+#include "query-fp.h"
 #include "string-util.h"
 
 #include <iostream>
@@ -1000,6 +1001,14 @@ notmuch_database_open_verbose (const char *path,
 	notmuch->term_gen->set_stemmer (Xapian::Stem ("english"));
 	notmuch->value_range_processor = new Xapian::NumberValueRangeProcessor (NOTMUCH_VALUE_TIMESTAMP);
 	notmuch->date_range_processor = new ParseTimeValueRangeProcessor (NOTMUCH_VALUE_TIMESTAMP);
+#if HAVE_XAPIAN_FIELD_PROCESSOR
+	/* This currently relies on the query parser to pass anything
+	 * with a .. to the range processor */
+	notmuch->date_field_processor = new DateFieldProcessor();
+	notmuch->query_parser->add_boolean_prefix("date", notmuch->date_field_processor);
+	notmuch->query_field_processor = new QueryFieldProcessor (*notmuch->query_parser, notmuch);
+	notmuch->query_parser->add_boolean_prefix("query", notmuch->query_field_processor);
+#endif
 	notmuch->last_mod_range_processor = new Xapian::NumberValueRangeProcessor (NOTMUCH_VALUE_LAST_MOD, "lastmod:");
 
 	notmuch->query_parser->set_default_op (Xapian::Query::OP_AND);
@@ -1761,18 +1770,11 @@ _notmuch_database_split_path (void *ctx,
     slash = path + strlen (path) - 1;
 
     /* First, skip trailing slashes. */
-    while (slash != path) {
-	if (*slash != '/')
-	    break;
-
+    while (slash != path && *slash == '/')
 	--slash;
-    }
 
     /* Then, find a slash. */
-    while (slash != path) {
-	if (*slash == '/')
-	    break;
-
+    while (slash != path && *slash != '/') {
 	if (basename)
 	    *basename = slash;
 
@@ -1780,12 +1782,8 @@ _notmuch_database_split_path (void *ctx,
     }
 
     /* Finally, skip multiple slashes. */
-    while (slash != path) {
-	if (*slash != '/')
-	    break;
-
+    while (slash != path && *(slash - 1) == '/')
 	--slash;
-    }
 
     if (slash == path) {
 	if (directory)
@@ -1794,7 +1792,7 @@ _notmuch_database_split_path (void *ctx,
 	    *basename = path;
     } else {
 	if (directory)
-	    *directory = talloc_strndup (ctx, path, slash - path + 1);
+	    *directory = talloc_strndup (ctx, path, slash - path);
     }
 
     return NOTMUCH_STATUS_SUCCESS;