X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fdatabase.cc;h=b6c4d07b794eb37ccdb73b68a31c993fc2326be8;hp=f3cac9109ecf67c253730ee95ef39448abcf4450;hb=dac01ec52036e0320f66211be3dc5e5126eb218f;hpb=591f901241623fbc50b67dbcff88c68cb33c53fd

diff --git a/lib/database.cc b/lib/database.cc
index f3cac910..b6c4d07b 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++;
 	    }
 	}
@@ -480,6 +484,7 @@ notmuch_database_open (const char *path,
     }
 
     notmuch = talloc (NULL, notmuch_database_t);
+    notmuch->exception_reported = FALSE;
     notmuch->path = talloc_strdup (notmuch, path);
 
     if (notmuch->path[strlen (notmuch->path) - 1] == '/')
@@ -496,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];
@@ -517,7 +524,7 @@ notmuch_database_open (const char *path,
 		 error.get_msg().c_str());
 	notmuch = NULL;
     }
-    
+
   DONE:
     if (notmuch_path)
 	free (notmuch_path);
@@ -530,12 +537,20 @@ notmuch_database_open (const char *path,
 void
 notmuch_database_close (notmuch_database_t *notmuch)
 {
-    if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE)
-	(static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->flush ();
+    try {
+	if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE)
+	    (static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->flush ();
+    } catch (const Xapian::Error &error) {
+	if (! notmuch->exception_reported) {
+	    fprintf (stderr, "Error: A Xapian exception occurred flushing database: %s\n",
+		     error.get_msg().c_str());
+	}
+    }
 
     delete notmuch->term_gen;
     delete notmuch->query_parser;
     delete notmuch->xapian_db;
+    delete notmuch->value_range_processor;
     talloc_free (notmuch);
 }
 
@@ -611,6 +626,7 @@ notmuch_database_set_timestamp (notmuch_database_t *notmuch,
     } catch (const Xapian::Error &error) {
 	fprintf (stderr, "A Xapian exception occurred setting timestamp: %s.\n",
 		 error.get_msg().c_str());
+	notmuch->exception_reported = TRUE;
 	ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
     }
 
@@ -639,6 +655,7 @@ notmuch_database_get_timestamp (notmuch_database_t *notmuch, const char *key)
 
 	ret =  Xapian::sortable_unserialise (doc.get_value (NOTMUCH_VALUE_TIMESTAMP));
     } catch (Xapian::Error &error) {
+	ret = 0;
 	goto DONE;
     }
 
@@ -838,12 +855,11 @@ _notmuch_database_link_message_to_children (notmuch_database_t *notmuch,
  *
  * We first look at 'message_file' and its link-relevant headers
  * (References and In-Reply-To) for message IDs. We also look in the
- * database for existing message that reference 'message'.p
+ * database for existing message that reference 'message'.
  *
- * The end result is to call _notmuch_message_add_thread_id with one
- * or more thread IDs to which this message belongs, (including
- * generating a new thread ID if necessary if the message doesn't
- * connect to any existing threads).
+ * The end result is to call _notmuch_message_ensure_thread_id which
+ * generates a new thread ID if the message doesn't connect to any
+ * existing threads.
  */
 static notmuch_status_t
 _notmuch_database_link_message (notmuch_database_t *notmuch,
@@ -882,7 +898,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 
     const char *date, *header;
     const char *from, *to, *subject;
-    char *message_id;
+    char *message_id = NULL;
 
     if (message_ret)
 	*message_ret = NULL;
@@ -927,11 +943,20 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 	header = notmuch_message_file_get_header (message_file, "message-id");
 	if (header && *header != '\0') {
 	    message_id = _parse_message_id (message_file, header, NULL);
+
 	    /* So the header value isn't RFC-compliant, but it's
 	     * better than no message-id at all. */
 	    if (message_id == NULL)
 		message_id = talloc_strdup (message_file, header);
-	} else {
+
+	    /* Reject a Message ID that's too long. */
+	    if (message_id && strlen (message_id) + 1 > NOTMUCH_TERM_MAX) {
+		talloc_free (message_id);
+		message_id = NULL;
+	    }
+	}
+
+	if (message_id == NULL ) {
 	    /* No message-id at all, let's generate one by taking a
 	     * hash over the file's contents. */
 	    char *sha1 = notmuch_sha1_of_file (filename);
@@ -985,6 +1010,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
     } catch (const Xapian::Error &error) {
 	fprintf (stderr, "A Xapian exception occurred adding message: %s.\n",
 		 error.get_description().c_str());
+	notmuch->exception_reported = TRUE;
 	ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
 	goto DONE;
     }
@@ -1002,3 +1028,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);
+}