X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-index-message.cc;h=6f0b21e73b7dd2175a0ace0e6ae220745bdcaccc;hp=b7a0d3e7bb37a8c440819def7d40f4ee4ceec8d2;hb=dceb501e44b5279df6df76b19688c156256b75c2;hpb=9dbb1facfb1af5f16b3311a75593693ec04fa6a6

diff --git a/notmuch-index-message.cc b/notmuch-index-message.cc
index b7a0d3e7..6f0b21e7 100644
--- a/notmuch-index-message.cc
+++ b/notmuch-index-message.cc
@@ -187,6 +187,23 @@ add_terms_address_addrs (Xapian::Document doc,
     }
 }
 
+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;
+}
+
 /* 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). */
@@ -198,7 +215,7 @@ gen_terms_body (Xapian::TermGenerator term_gen,
     GIOChannel *channel;
     GIOStatus gio_status;
     GError *error = NULL;
-    char *body_str;
+    char *p, *body_line = NULL, *prev_line = NULL;
 
     channel = g_io_channel_new_file (filename, "r", &error);
     if (channel == NULL) {
@@ -213,16 +230,60 @@ gen_terms_body (Xapian::TermGenerator term_gen,
 	exit (1);
     }
 
-    gio_status = g_io_channel_read_to_end (channel, &body_str,
-					   NULL, &error);
-    if (gio_status != G_IO_STATUS_NORMAL) {
-	fprintf (stderr, "Error: %s\n", error->message);
-	exit (1);
+    while (1) {
+	if (body_line)
+	    g_free (body_line);
+
+	gio_status = g_io_channel_read_line (channel, &body_line,
+					     NULL, NULL, &error);
+	if (gio_status == G_IO_STATUS_EOF)
+	    break;
+	if (gio_status != G_IO_STATUS_NORMAL) {
+	    fprintf (stderr, "Error: %s\n", error->message);
+	    exit (1);
+	}
+
+	if (strlen (body_line) == 0)
+	    continue;
+
+	/* If the line looks like it might be introducing a quote,
+	 * save it until we see if the next line begins a quote. */
+	p = body_line + strlen (body_line) - 1;
+	while (p > body_line and isspace (*p))
+	    p--;
+	if (*p == ':') {
+	    prev_line = body_line;
+	    body_line = NULL;
+	    continue;
+	}
+
+	/* Skip quoted lines, (and previous lines that introduced them) */
+	if (body_line[0] == '>') {
+	    if (prev_line) {
+		g_free (prev_line);
+		prev_line = NULL;
+	    }
+	    continue;
+	}
+
+	/* Now that we're not looking at a quote we can add the prev_line */
+	if (prev_line) {
+	    gen_terms (term_gen, "body", prev_line);
+	    g_free (prev_line);
+	    prev_line = NULL;
+	}
+
+	/* Skip signatures */
+	/* XXX: Should only do this if "near" the end of the message. */
+	if (strncmp (body_line, "-- ", 3) == 0)
+	    break;
+
+	gen_terms (term_gen, "body", body_line);
     }
 
-    gen_terms (term_gen, "body", body_str);
+    if (body_line)
+	g_free (body_line);
 
-    g_free (body_str);
     g_io_channel_close (channel);
 }
 
@@ -293,6 +354,7 @@ main (int argc, char **argv)
 	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);
 
@@ -323,12 +385,10 @@ main (int argc, char **argv)
 	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);