}
}
+static const char *
+skip_re_in_subject (const char *subject)
+{
+ const char *s = subject;
+
+ while (*s) {
+ while (*s && isspace (*s))
+ s++;
+ if (strncasecmp (s, "re:", 3) == 0)
+ s += 3;
+ else
+ break;
+ }
+
+ return s;
+}
+
+/* Add a term for each message-id in the References header of the
+ * message. */
+static void
+add_terms_references (Xapian::Document doc,
+ GMimeMessage *message)
+{
+ const char *refs, *end, *next;
+ char *term;
+
+ refs = g_mime_object_get_header (GMIME_OBJECT (message), "references");
+
+ while (*refs) {
+ while (*refs && isspace (*refs))
+ refs++;
+ if (*refs == '<')
+ refs++;
+ end = refs;
+ while (*end && !isspace (*end))
+ end++;
+ next = end;
+ end--;
+ if (end > refs && *end == '>')
+ end--;
+ if (end > refs) {
+ term = g_strndup (refs, end - refs + 1);
+ add_term (doc, "ref", term);
+ g_free (term);
+ }
+ refs = next;
+ }
+}
+
/* Generate terms for the body of a message, given the filename of the
* message and the offset at which the headers of the message end,
* (and hence the body begins). */
gen_terms_address_names (term_gen, addresses, "to_name");
value = g_mime_message_get_subject (message);
+ value = skip_re_in_subject (value);
gen_terms (term_gen, "subject", value);
gen_terms (term_gen, "body", value);
gen_terms_body (term_gen, filename,
g_mime_parser_get_headers_end (parser));
+ add_terms_references (doc, message);
+
from = g_mime_message_get_sender (message);
addresses = internet_address_list_parse_string (from);
add_term (doc, "label", "inbox");
add_term (doc, "label", "unread");
add_term (doc, "type", "mail");
+ add_term (doc, "source_id", "1");
value = g_mime_message_get_message_id (message);
add_term (doc, "msgid", value);
-
- add_term (doc, "source_id", "1");
-
add_term (doc, "thread", value);
doc.add_value (NOTMUCH_VALUE_MESSAGE_ID, value);