X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fmessage.cc;h=d993cde834a33baa5614ecf66d8272ed87c273c7;hp=ecda75af208b416124fd9cc6bc165c56e5ed0521;hb=4b55df85348c4ad4129bf6a9af052231f1d6716e;hpb=d19c5de17a606e08860a5de951c780038dec2f89

diff --git a/lib/message.cc b/lib/message.cc
index ecda75af..d993cde8 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -25,7 +25,7 @@
 
 #include <gmime/gmime.h>
 
-struct _notmuch_message {
+struct visible _notmuch_message {
     notmuch_database_t *notmuch;
     Xapian::docid doc_id;
     int frozen;
@@ -213,7 +213,6 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
 {
     notmuch_message_t *message;
     Xapian::Document doc;
-    Xapian::WritableDatabase *db;
     unsigned int doc_id;
     char *term;
 
@@ -233,7 +232,6 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch,
     if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY)
 	INTERNAL_ERROR ("Failure to ensure database is writable.");
 
-    db = static_cast<Xapian::WritableDatabase *> (notmuch->xapian_db);
     try {
 	doc.add_term (term, 0);
 	talloc_free (term);
@@ -516,6 +514,8 @@ _notmuch_message_remove_filename (notmuch_message_t *message,
     const char *folder_prefix = _find_prefix ("folder");
     int folder_prefix_len = strlen (folder_prefix);
     void *local = talloc_new (message);
+    char *zfolder_prefix = talloc_asprintf(local, "Z%s", folder_prefix);
+    int zfolder_prefix_len = strlen (zfolder_prefix);
     char *direntry;
     notmuch_private_status_t private_status;
     notmuch_status_t status;
@@ -532,9 +532,12 @@ _notmuch_message_remove_filename (notmuch_message_t *message,
     status = COERCE_STATUS (private_status,
 			    "Unexpected error from _notmuch_message_remove_term");
 
-    /* Re-synchronize "folder:" terms for this message. This requires
-     * first removing all "folder:" terms, then adding back terms for
-     * all remaining filenames of the message. */
+    /* Re-synchronize "folder:" terms for this message. This requires:
+     *  1. removing all "folder:" terms
+     *  2. removing all "folder:" stemmed terms
+     *  3. adding back terms for all remaining filenames of the message. */
+
+    /* 1. removing all "folder:" terms */
     while (1) {
 	i = message->doc.termlist_begin ();
 	i.skip_to (folder_prefix);
@@ -553,6 +556,26 @@ _notmuch_message_remove_filename (notmuch_message_t *message,
 	}
     }
 
+    /* 2. removing all "folder:" stemmed terms */
+    while (1) {
+	i = message->doc.termlist_begin ();
+	i.skip_to (zfolder_prefix);
+
+	/* Terminate loop when no terms remain with desired prefix. */
+	if (i == message->doc.termlist_end () ||
+	    strncmp ((*i).c_str (), zfolder_prefix, zfolder_prefix_len))
+	{
+	    break;
+	}
+
+	try {
+	    message->doc.remove_term ((*i));
+	} catch (const Xapian::InvalidArgumentError) {
+	    /* Ignore failure to remove non-existent term. */
+	}
+    }
+
+    /* 3. adding back terms for all remaining filenames of the message. */
     i = message->doc.termlist_begin ();
     i.skip_to (direntry_prefix);
 
@@ -839,7 +862,7 @@ _notmuch_message_add_term (notmuch_message_t *message,
 
 /* Parse 'text' and add a term to 'message' for each parsed word. Each
  * term will be added both prefixed (if prefix_name is not NULL) and
- * also unprefixed). */
+ * also non-prefixed). */
 notmuch_private_status_t
 _notmuch_message_gen_terms (notmuch_message_t *message,
 			    const char *prefix_name,