debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 10:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Protect against missing message id while indexing files

Browse source
This commit is contained in:
Keith Packard 2009-10-14 21:46:54 -07:00
parent 8f3ccda00f
commit a2c467242a
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,6 +1,6 @@
PROGS=notmuch-index-message xapian-dump PROGS=notmuch-index-message xapian-dump
MYCXXFLAGS=-Wall MYCXXFLAGS=-Wall -O0 -g
all: $(PROGS) all: $(PROGS)

8
notmuch-index-message.cc
View file

@ -662,8 +662,10 @@ index_file (Xapian::WritableDatabase db,
add_term (doc, "type", "mail"); add_term (doc, "type", "mail");
add_term (doc, "source_id", "1"); add_term (doc, "source_id", "1");
add_term (doc, "msgid", message_id); if (message_id) {
doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, message_id); add_term (doc, "msgid", message_id);
doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, message_id);
}
if (thread_ids->len) { if (thread_ids->len) {
unsigned int i; unsigned int i;
@ -687,7 +689,7 @@ index_file (Xapian::WritableDatabase db,
doc.add_value (NOTMUCH_VALUE_THREAD, thread_id->str); doc.add_value (NOTMUCH_VALUE_THREAD, thread_id->str);
g_string_free (thread_id, TRUE); g_string_free (thread_id, TRUE);
} else { } else if (message_id) {
/* If not referenced thread, use the message ID */ /* If not referenced thread, use the message ID */
add_term (doc, "thread", message_id); add_term (doc, "thread", message_id);
doc.add_value (NOTMUCH_VALUE_THREAD, message_id); doc.add_value (NOTMUCH_VALUE_THREAD, message_id);