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

Factor out parsing of reference-header values and pickup In-reply-to.

Browse source 
This is in preparation for doing a couple of passes over the references,
(one to add terms to the database, and a second to find the thread_id).

We also now parse the In-reply-to header which we were missing before.
We treat it identically to the References header.
This commit is contained in:
Carl Worth 2009-10-14 08:02:27 -07:00
parent 09f765ce18
commit 5cbdcbbec5
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
notmuch-index-message.cc
View file

@ -207,13 +207,10 @@ skip_re_in_subject (const char *subject)
/* Add a term for each message-id in the References header of the /* Add a term for each message-id in the References header of the
* message. */ * message. */
static void static void
add_terms_references (Xapian::Document doc, parse_references (GPtrArray *array,
GMimeMessage *message) const char *refs)
{ {
const char *refs, *end, *next; const char *end, *next;
char *term;
refs = g_mime_object_get_header (GMIME_OBJECT (message), "references");
if (refs == NULL) if (refs == NULL)
return; return;
@ -231,9 +228,7 @@ add_terms_references (Xapian::Document doc,
if (end > refs && *end == '>') if (end > refs && *end == '>')
end--; end--;
if (end > refs) { if (end > refs) {
term = g_strndup (refs, end - refs + 1); g_ptr_array_add (array, g_strndup (refs, end - refs + 1));
add_term (doc, "ref", term);
g_free (term);
} }
refs = next; refs = next;
} }
@ -335,6 +330,7 @@ index_file (Xapian::WritableDatabase db,
GMimeParser *parser; GMimeParser *parser;
GMimeMessage *message; GMimeMessage *message;
InternetAddressList *addresses; InternetAddressList *addresses;
GPtrArray *parents;
FILE *file; FILE *file;
@ -343,6 +339,7 @@ index_file (Xapian::WritableDatabase db,
time_t time; time_t time;
struct tm gm_time_tm; struct tm gm_time_tm;
char date_str[16]; /* YYYYMMDDHHMMSS + 1 for Y100k compatibility ;-) */ char date_str[16]; /* YYYYMMDDHHMMSS + 1 for Y100k compatibility ;-) */
unsigned int i;
file = fopen (filename, "r"); file = fopen (filename, "r");
if (! file) { if (! file) {
@ -380,7 +377,20 @@ index_file (Xapian::WritableDatabase db,
gen_terms_body (term_gen, filename, gen_terms_body (term_gen, filename,
g_mime_parser_get_headers_end (parser)); g_mime_parser_get_headers_end (parser));
add_terms_references (doc, message); parents = g_ptr_array_new ();
value = g_mime_object_get_header (GMIME_OBJECT (message), "references");
parse_references (parents, value);
value = g_mime_object_get_header (GMIME_OBJECT (message), "in-reply-to");
parse_references (parents, value);
for (i = 0; i < parents->len; i++)
add_term (doc, "ref", (const char *) g_ptr_array_index (parents, i));
for (i = 0; i < parents->len; i++)
g_free (g_ptr_array_index (parents, i));
g_ptr_array_free (parents, TRUE);
from = g_mime_message_get_sender (message); from = g_mime_message_get_sender (message);
addresses = internet_address_list_parse_string (from); addresses = internet_address_list_parse_string (from);