debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-03 15:21:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix folder: coherence issue

Browse source 
Add removal of all ZXFOLDER terms to removal of all XFOLDER terms for
each message filename removal.

The existing filename-list reindexing will put all the needed terms
back in.  Test search-folder-coherence now passes.

Signed-off-by:Mark Anderson <ma.skies@gmail.com>
This commit is contained in:
Mark Anderson 2011-06-29 14:04:45 -06:00 committed by Carl Worth
parent 55a78d5dbd
commit 8a856e5c38
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/message.cc
View file

@ -514,6 +514,8 @@ _notmuch_message_remove_filename (notmuch_message_t *message,
const char *folder_prefix = _find_prefix ("folder"); const char *folder_prefix = _find_prefix ("folder");
int folder_prefix_len = strlen (folder_prefix); int folder_prefix_len = strlen (folder_prefix);
void *local = talloc_new (message); void *local = talloc_new (message);
char *zfolder_prefix = talloc_asprintf(local, "Z%s", folder_prefix);
int zfolder_prefix_len = strlen (zfolder_prefix);
char *direntry; char *direntry;
notmuch_private_status_t private_status; notmuch_private_status_t private_status;
notmuch_status_t status; notmuch_status_t status;
@ -530,9 +532,12 @@ _notmuch_message_remove_filename (notmuch_message_t *message,
status = COERCE_STATUS (private_status, status = COERCE_STATUS (private_status,
"Unexpected error from _notmuch_message_remove_term"); "Unexpected error from _notmuch_message_remove_term");
/* Re-synchronize "folder:" terms for this message. This requires /* Re-synchronize "folder:" terms for this message. This requires:
* first removing all "folder:" terms, then adding back terms for * 1. removing all "folder:" terms
* all remaining filenames of the message. */ * 2. removing all "folder:" stemmed terms
* 3. adding back terms for all remaining filenames of the message. */
/* 1. removing all "folder:" terms */
while (1) { while (1) {
i = message->doc.termlist_begin (); i = message->doc.termlist_begin ();
i.skip_to (folder_prefix); i.skip_to (folder_prefix);
@ -551,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 = message->doc.termlist_begin ();
i.skip_to (direntry_prefix); i.skip_to (direntry_prefix);