X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchIdx.pm;h=fd0d320e8685fe34c37b5f07162d3e81da2f0c06;hb=1c9be46742295e943f7d919ee01ecbf134cbf493;hp=37fefbeaff2a05ef5a225475fbbabd4e651adbb0;hpb=c617254e00ae43414236603cf9bbcdc8cbc2b139;p=public-inbox.git

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 37fefbea..fd0d320e 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -4,13 +4,13 @@
 #
 # Indexes mail with Xapian and our (SQLite-based) ::Msgmap for use
 # with the web and NNTP interfaces.  This index maintains thread
-# relationships for use by Mail::Thread.  This writes to the search
-# index.
+# relationships for use by PublicInbox::SearchThread.
+# This writes to the search index.
 package PublicInbox::SearchIdx;
 use strict;
 use warnings;
 use Fcntl qw(:flock :DEFAULT);
-use Email::MIME;
+use PublicInbox::MIME;
 use Email::MIME::ContentType;
 $Email::MIME::ContentType::STRICT_PARAMS = 0;
 use base qw(PublicInbox::Search);
@@ -117,7 +117,7 @@ sub add_values ($$$) {
 			$smsg->{mime}->body_raw =~ tr!\n!\n!);
 
 	my $yyyymmdd = strftime('%Y%m%d', gmtime($ts));
-	$doc->add_value(&PublicInbox::Search::YYYYMMDD, $yyyymmdd);
+	add_val($doc, PublicInbox::Search::YYYYMMDD, $yyyymmdd);
 }
 
 sub index_users ($$) {
@@ -129,15 +129,16 @@ sub index_users ($$) {
 
 	$tg->index_text($from, 1, 'A'); # A - author
 	$tg->increase_termpos;
-
 	$tg->index_text($to, 1, 'XTO') if $to ne '';
+	$tg->increase_termpos;
 	$tg->index_text($cc, 1, 'XCC') if $cc ne '';
-	my $tc = join("\t", $to, $cc);
-	$tg->index_text($tc, 1, 'XTC') if $tc ne '';
-	my $tcf = join("\t", $tc, $from);
-	$tg->index_text($tcf, 1, 'XTCF') if $tcf ne '';
+	$tg->increase_termpos;
+}
 
-	$tg->index_text($from);
+sub index_body ($$$) {
+	my ($tg, $lines, $inc) = @_;
+	$tg->index_text(join("\n", @$lines), $inc, $inc ? 'XNQ' : 'XQUOT');
+	@$lines = ();
 	$tg->increase_termpos;
 }
 
@@ -147,7 +148,6 @@ sub add_message {
 
 	my ($doc_id, $old_tid);
 	my $mid = mid_clean(mid_mime($mime));
-	my $ct_msg = $mime->header('Content-Type') || 'text/plain';
 
 	eval {
 		die 'Message-ID too long' if length($mid) > MAX_MID_SIZE;
@@ -155,7 +155,7 @@ sub add_message {
 		if ($smsg) {
 			# convert a ghost to a regular message
 			# it will also clobber any existing regular message
-			$doc_id = $smsg->doc_id;
+			$doc_id = $smsg->{doc_id};
 			$old_tid = $smsg->thread_id;
 		}
 		$smsg = PublicInbox::SearchMsg->new($mime);
@@ -175,43 +175,50 @@ sub add_message {
 		$tg->set_document($doc);
 		$tg->index_text($subj, 1, 'S') if $subj;
 		$tg->increase_termpos;
-		$tg->index_text($subj) if $subj;
-		$tg->increase_termpos;
 
 		index_users($tg, $smsg);
 
 		msg_iter($mime, sub {
 			my ($part, $depth, @idx) = @{$_[0]};
-			my $ct = $part->content_type || $ct_msg;
+			my $ct = $part->content_type || 'text/plain';
+			my $fn = $part->filename;
+			if (defined $fn && $fn ne '') {
+				$tg->index_text($fn, 1, 'XFN');
+			}
 
-			# account for filter bugs...
-			$ct =~ m!\btext/plain\b!i or return;
+			return if $ct =~ m!\btext/x?html\b!i;
+
+			my $s = eval { $part->body_str };
+			if ($@) {
+				if ($ct =~ m!\btext/plain\b!i) {
+					# Try to assume UTF-8 because Alpine
+					# seems to do wacky things and set
+					# charset=X-UNKNOWN
+					$part->charset_set('UTF-8');
+					$s = eval { $part->body_str };
+					$s = $part->body if $@;
+				}
+			}
+			defined $s or return;
 
 			my (@orig, @quot);
 			my $body = $part->body;
-			$part->body_set('');
 			my @lines = split(/\n/, $body);
 			while (defined(my $l = shift @lines)) {
-				if ($l =~ /^\s*>/) {
+				if ($l =~ /^>/) {
+					index_body($tg, \@orig, 1) if @orig;
 					push @quot, $l;
 				} else {
+					index_body($tg, \@quot, 0) if @quot;
 					push @orig, $l;
 				}
 			}
-			if (@quot) {
-				$tg->index_text(join("\n", @quot), 0);
-				@quot = ();
-				$tg->increase_termpos;
-			}
-			if (@orig) {
-				$tg->index_text(join("\n", @orig));
-				@orig = ();
-				$tg->increase_termpos;
-			}
+			index_body($tg, \@quot, 0) if @quot;
+			index_body($tg, \@orig, 1) if @orig;
 		});
 
 		link_message($self, $smsg, $old_tid);
-		$tg->index_text($mid, 1);
+		$tg->index_text($mid, 1, 'XMID');
 		$doc->set_data($smsg->to_doc_data($blob));
 
 		if (my $altid = $self->{-altid}) {
@@ -282,15 +289,14 @@ sub link_message {
 	my ($self, $smsg, $old_tid) = @_;
 	my $doc = $smsg->{doc};
 	my $mid = $smsg->mid;
-	my $mime = $smsg->mime;
+	my $mime = $smsg->{mime};
 	my $hdr = $mime->header_obj;
-	my $refs = $hdr->header_raw('References');
-	my @refs = $refs ? ($refs =~ /<([^>]+)>/g) : ();
-	if (my $irt = $hdr->header_raw('In-Reply-To')) {
-		# last References should be $irt
-		# we will de-dupe later
-		push @refs, mid_clean($irt);
-	}
+
+	# last References should be IRT, but some mail clients do things
+	# out of order, so trust IRT over References iff IRT exists
+	my @refs = ($hdr->header_raw('References'),
+			$hdr->header_raw('In-Reply-To'));
+	@refs = ((join(' ', @refs)) =~ /<([^>]+)>/g);
 
 	my $tid;
 	if (@refs) {
@@ -308,6 +314,7 @@ sub link_message {
 			push @refs, $ref;
 		}
 	}
+
 	if (@refs) {
 		$smsg->{references} = '<'.join('> <', @refs).'>';
 
@@ -323,7 +330,7 @@ sub link_message {
 			merge_threads($self, $tid, $ptid);
 		}
 	} else {
-		$tid = $self->next_thread_id;
+		$tid = defined $old_tid ? $old_tid : $self->next_thread_id;
 	}
 	$doc->add_term(xpfx('thread') . $tid);
 }
@@ -379,7 +386,7 @@ sub do_cat_mail {
 		my $str = $git->cat_file($blob, $sizeref);
 		# fixup bugs from import:
 		$$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
-		Email::MIME->new($str);
+		PublicInbox::MIME->new($str);
 	};
 	$@ ? undef : $mime;
 }
@@ -613,7 +620,7 @@ sub with_umask {
 	my $rv = eval { $cb->() };
 	my $err = $@;
 	umask $old;
-	die $err if $@;
+	die $err if $err;
 	$rv;
 }