const char *prefix_name)
{
const char *name;
+ int own_name = 0;
name = internet_address_get_name (address);
+ /* In the absence of a name, we'll strip the part before the @
+ * from the address. */
+ if (! name) {
+ InternetAddressMailbox *mailbox = INTERNET_ADDRESS_MAILBOX (address);
+ const char *addr = internet_address_mailbox_get_addr (mailbox);
+ const char *at;
+
+ at = strchr (addr, '@');
+ if (at) {
+ name = strndup (addr, at - addr);
+ own_name = 1;
+ }
+ }
+
if (name)
gen_terms (term_gen, prefix_name, name);
+
+ if (own_name)
+ free ((void *) name);
}
static void
insert_thread_id (GHashTable *thread_ids, Xapian::Document doc)
{
string value_string;
- const char *value;
+ const char *value, *id, *comma;
value_string = doc.get_value (NOTMUCH_VALUE_THREAD);
value = value_string.c_str();
- if (strlen (value))
- g_hash_table_insert (thread_ids, strdup (value), NULL);
+ if (strlen (value)) {
+ id = value;
+ while (*id) {
+ comma = strchr (id, ',');
+ if (comma == NULL)
+ comma = id + strlen (id);
+ g_hash_table_insert (thread_ids,
+ strndup (id, comma - id), NULL);
+ id = comma;
+ if (*id)
+ id++;
+ }
+ }
}
-static char *
-find_thread_id (Xapian::Database db,
- GPtrArray *parents,
- const char *message_id)
+/* Return one or more thread_ids, (as a GPtrArray of strings), for the
+ * given message based on looking into the database for any messages
+ * referenced in parents, and also for any messages in the database
+ * referencing message_id.
+ *
+ * Caller should free all strings in the array and the array itself,
+ * (g_ptr_array_free) when done. */
+static GPtrArray *
+find_thread_ids (Xapian::Database db,
+ GPtrArray *parents,
+ const char *message_id)
{
Xapian::PostingIterator child, children_end;
Xapian::Document doc;
GHashTable *thread_ids;
GList *keys, *l;
- GString *result = NULL;
unsigned int i;
const char *parent_message_id;
+ GPtrArray *result;
thread_ids = g_hash_table_new (g_str_hash, g_str_equal);
insert_thread_id (thread_ids, doc);
}
+ result = g_ptr_array_new ();
+
keys = g_hash_table_get_keys (thread_ids);
for (l = keys; l; l = l->next) {
char *id = (char *) l->data;
- if (result == NULL) {
- result = g_string_new (id);
- } else {
- g_string_append_printf (result, ",%s", id);
- }
- free (id);
+ g_ptr_array_add (result, id);
}
- if (result)
- return g_string_free (result, FALSE);
- else
- return NULL;
+ return result;
}
/* Add a term for each message-id in the References header of the
continue;
/* Also skip lines introducing a quote on the next line. */
- while (line_end > line && isspace (*line_end))
- line_end--;
-
if (*line_end == ':' && *next_line == '>')
continue;
/* Callback to generate terms for each mime part of a message. */
static void
-gen_terms_part (GMimeObject *parent,
- GMimeObject *part,
- gpointer user_data)
+gen_terms_part (Xapian::TermGenerator term_gen,
+ GMimeObject *part)
{
- Xapian::TermGenerator *term_gen = (Xapian::TermGenerator *) user_data;
GMimeStream *stream;
GMimeDataWrapper *wrapper;
GByteArray *byte_array;
+ GMimeContentDisposition *disposition;
char *body;
+ if (GMIME_IS_MULTIPART (part)) {
+ GMimeMultipart *multipart = GMIME_MULTIPART (part);
+ int i;
+
+ for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
+ if (GMIME_IS_MULTIPART_SIGNED (multipart)) {
+ /* Don't index the signature. */
+ if (i == 1)
+ continue;
+ if (i > 1)
+ fprintf (stderr, "Warning: Unexpected extra parts of mutlipart/signed. Indexing anyway.\n");
+ }
+ gen_terms_part (term_gen,
+ g_mime_multipart_get_part (multipart, i));
+ }
+ return;
+ }
+
if (! GMIME_IS_PART (part)) {
fprintf (stderr, "Warning: Not indexing unknown mime part: %s.\n",
g_type_name (G_OBJECT_TYPE (part)));
return;
}
+ disposition = g_mime_object_get_content_disposition (GMIME_OBJECT (part));
+ if (disposition &&
+ strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
+ {
+ add_term (term_gen.get_document (), "label", "attachment");
+ }
+
byte_array = g_byte_array_new ();
stream = g_mime_stream_mem_new_with_byte_array (byte_array);
g_object_unref (stream);
+ g_byte_array_append (byte_array, (guint8 *) "\0", 1);
body = (char *) g_byte_array_free (byte_array, FALSE);
- gen_terms_body_str (*term_gen, body);
+ gen_terms_body_str (term_gen, body);
free (body);
}
GMimeParser *parser;
GMimeMessage *message;
InternetAddressList *addresses;
- GPtrArray *parents;
+ GPtrArray *parents, *thread_ids;
FILE *file;
const char *subject, *refs, *in_reply_to, *from;
- const char *message_id, *thread_id;
+ const char *message_id;
time_t time;
struct tm gm_time_tm;
gen_terms (term_gen, "subject", subject);
gen_terms (term_gen, "body", subject);
- g_mime_message_foreach (message, gen_terms_part, &term_gen);
+ gen_terms_part (term_gen, g_mime_message_get_mime_part (message));
parents = g_ptr_array_new ();
message_id = g_mime_message_get_message_id (message);
- thread_id = find_thread_id (db, parents, message_id);
+ thread_ids = find_thread_ids (db, parents, message_id);
for (i = 0; i < parents->len; i++)
g_free (g_ptr_array_index (parents, i));
add_term (doc, "msgid", message_id);
doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, message_id);
- if (thread_id) {
- add_term (doc, "thread", thread_id);
- doc.add_value (NOTMUCH_VALUE_THREAD, thread_id);
- free ((void *) thread_id);
+ if (thread_ids->len) {
+ unsigned int i;
+ GString *thread_id;
+ char *id;
+
+ for (i = 0; i < thread_ids->len; i++) {
+ id = (char *) thread_ids->pdata[i];
+
+ add_term (doc, "thread", id);
+
+ if (i == 0)
+ thread_id = g_string_new (id);
+ else
+ g_string_append_printf (thread_id, ",%s", id);
+
+ free (id);
+ }
+ g_ptr_array_free (thread_ids, TRUE);
+
+ doc.add_value (NOTMUCH_VALUE_THREAD, thread_id->str);
+
+ g_string_free (thread_id, TRUE);
} else {
/* If not referenced thread, use the message ID */
add_term (doc, "thread", message_id);
projects / notmuch / blobdiff