X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fdatabase.cc;h=23ddd4ae1314b2186b7839364b06cc0d25b5a575;hp=f4a445aa8d4485e0a8419945f687402fa47adfb8;hb=de4be1b2293699e45d42b6f395b16d854151a58f;hpb=5d56e931b99d575dbb0b936d24aae5e9903861ad

diff --git a/lib/database.cc b/lib/database.cc
index f4a445aa..23ddd4ae 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -147,17 +147,20 @@ _find_prefix (const char *name)
 {
     unsigned int i;
 
-    for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_INTERNAL); i++)
+    for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_INTERNAL); i++) {
 	if (strcmp (name, BOOLEAN_PREFIX_INTERNAL[i].name) == 0)
 	    return BOOLEAN_PREFIX_INTERNAL[i].prefix;
+    }
 
-    for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_EXTERNAL); i++)
+    for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_EXTERNAL); i++) {
 	if (strcmp (name, BOOLEAN_PREFIX_EXTERNAL[i].name) == 0)
 	    return BOOLEAN_PREFIX_EXTERNAL[i].prefix;
+    }
 
-    for (i = 0; i < ARRAY_SIZE (PROBABILISTIC_PREFIX); i++)
+    for (i = 0; i < ARRAY_SIZE (PROBABILISTIC_PREFIX); i++) {
 	if (strcmp (name, PROBABILISTIC_PREFIX[i].name) == 0)
 	    return PROBABILISTIC_PREFIX[i].prefix;
+    }
 
     INTERNAL_ERROR ("No prefix exists for '%s'\n", name);
 
@@ -295,13 +298,14 @@ skip_space_and_comments (const char **str)
 	    int nesting = 1;
 	    s++;
 	    while (*s && nesting) {
-		if (*s == '(')
+		if (*s == '(') {
 		    nesting++;
-		else if (*s == ')')
+		} else if (*s == ')') {
 		    nesting--;
-		else if (*s == '\\')
+		} else if (*s == '\\') {
 		    if (*(s+1))
 			s++;
+		}
 		s++;
 	    }
 	}
@@ -497,11 +501,13 @@ notmuch_database_open (const char *path,
 	notmuch->query_parser = new Xapian::QueryParser;
 	notmuch->term_gen = new Xapian::TermGenerator;
 	notmuch->term_gen->set_stemmer (Xapian::Stem ("english"));
+	notmuch->value_range_processor = new Xapian::NumberValueRangeProcessor (NOTMUCH_VALUE_TIMESTAMP);
 
 	notmuch->query_parser->set_default_op (Xapian::Query::OP_AND);
 	notmuch->query_parser->set_database (*notmuch->xapian_db);
 	notmuch->query_parser->set_stemmer (Xapian::Stem ("english"));
 	notmuch->query_parser->set_stemming_strategy (Xapian::QueryParser::STEM_SOME);
+	notmuch->query_parser->add_valuerangeprocessor (notmuch->value_range_processor);
 
 	for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_EXTERNAL); i++) {
 	    prefix_t *prefix = &BOOLEAN_PREFIX_EXTERNAL[i];
@@ -518,7 +524,7 @@ notmuch_database_open (const char *path,
 		 error.get_msg().c_str());
 	notmuch = NULL;
     }
-    
+
   DONE:
     if (notmuch_path)
 	free (notmuch_path);
@@ -544,6 +550,7 @@ notmuch_database_close (notmuch_database_t *notmuch)
     delete notmuch->term_gen;
     delete notmuch->query_parser;
     delete notmuch->xapian_db;
+    delete notmuch->value_range_processor;
     talloc_free (notmuch);
 }
 
@@ -1022,3 +1029,46 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
     return ret;
 }
+
+notmuch_tags_t *
+_notmuch_convert_tags (void *ctx, Xapian::TermIterator &i,
+		       Xapian::TermIterator &end)
+{
+    const char *prefix = _find_prefix ("tag");
+    notmuch_tags_t *tags;
+    std::string tag;
+
+    /* Currently this iteration is written with the assumption that
+     * "tag" has a single-character prefix. */
+    assert (strlen (prefix) == 1);
+
+    tags = _notmuch_tags_create (ctx);
+    if (unlikely (tags == NULL))
+	return NULL;
+
+    i.skip_to (prefix);
+
+    while (i != end) {
+	tag = *i;
+
+	if (tag.empty () || tag[0] != *prefix)
+	    break;
+
+	_notmuch_tags_add_tag (tags, tag.c_str () + 1);
+
+	i++;
+    }
+
+    _notmuch_tags_prepare_iterator (tags);
+
+    return tags;
+}
+
+notmuch_tags_t *
+notmuch_database_get_all_tags (notmuch_database_t *db)
+{
+    Xapian::TermIterator i, end;
+    i = db->xapian_db->allterms_begin();
+    end = db->xapian_db->allterms_end();
+    return _notmuch_convert_tags(db, i, end);
+}