X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchIdx.pm;h=579b85e3927cfd70df044db9ff9a224335e2a1d9;hb=0c586dc64b3b6642a894e125d09df446667a4079;hp=89d8bc2b282dbf64bc71d87b1d1e1fb66b4fef24;hpb=1a02e2d367b71eca9fc8093ce83fcae50873003d;p=public-inbox.git

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 89d8bc2b..579b85e3 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -275,22 +275,8 @@ sub index_diff ($$$) {
 	index_text($self, join("\n", @xnq), 1, 'XNQ');
 }
 
-sub index_body ($$$) {
-	my ($self, $txt, $doc) = @_;
-	if ($doc) {
-		# does it look like a diff?
-		if ($txt =~ /^(?:diff|---|\+\+\+) /ms) {
-			index_diff($self, $txt, $doc);
-		} else {
-			index_text($self, $txt, 1, 'XNQ');
-		}
-	} else {
-		index_text($self, $txt, 0, 'XQUOT');
-	}
-}
-
 sub index_xapian { # msg_iter callback
-	my ($part, $depth, @idx) = @{$_[0]};
+	my $part = $_[0]->[0]; # ignore $depth and @idx
 	my ($self, $doc) = @{$_[1]};
 	my $ct = $part->content_type || 'text/plain';
 	my $fn = $part->filename;
@@ -300,11 +286,24 @@ sub index_xapian { # msg_iter callback
 
 	my ($s, undef) = msg_part_text($part, $ct);
 	defined $s or return;
+	$_[0]->[0] = $part = undef; # free memory
 
 	# split off quoted and unquoted blocks:
 	my @sections = PublicInbox::MsgIter::split_quotes($s);
-	$part = $s = undef;
-	index_body($self, $_, /\A>/ ? 0 : $doc) for @sections;
+	undef $s; # free memory
+	for my $txt (@sections) {
+		if ($txt =~ /\A>/) {
+			index_text($self, $txt, 0, 'XQUOT');
+		} else {
+			# does it look like a diff?
+			if ($txt =~ /^(?:diff|---|\+\+\+) /ms) {
+				index_diff($self, $txt, $doc);
+			} else {
+				index_text($self, $txt, 1, 'XNQ');
+			}
+		}
+		undef $txt; # free memory
+	}
 }
 
 sub add_xapian ($$$$) {
@@ -552,13 +551,9 @@ sub unindex_both {
 
 sub do_cat_mail {
 	my ($git, $blob, $sizeref) = @_;
-	my $mime = eval {
-		my $str = $git->cat_file($blob, $sizeref);
-		# fixup bugs from import:
-		$$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
-		PublicInbox::MIME->new($str);
-	};
-	$@ ? undef : $mime;
+	my $str = $git->cat_file($blob, $sizeref) or
+		die "BUG: $blob not found in $git->{git_dir}";
+	PublicInbox::MIME->new($str);
 }
 
 # called by public-inbox-index
@@ -603,7 +598,7 @@ sub read_log {
 				}
 				next;
 			}
-			my $mime = do_cat_mail($git, $blob, \$bytes) or next;
+			my $mime = do_cat_mail($git, $blob, \$bytes);
 			my $smsg = bless {}, 'PublicInbox::Smsg';
 			batch_adjust(\$max, $bytes, $batch_cb, $latest, ++$nr);
 			$smsg->{blob} = $blob;
@@ -624,7 +619,7 @@ sub read_log {
 	close($log) or die "git log failed: \$?=$?";
 	# get the leftovers
 	foreach my $blob (keys %D) {
-		my $mime = do_cat_mail($git, $blob, \$bytes) or next;
+		my $mime = do_cat_mail($git, $blob, \$bytes);
 		$del_cb->($self, $mime);
 	}
 	$batch_cb->($nr, $latest, $newest);
@@ -635,7 +630,7 @@ sub _git_log {
 	my $git = $self->{git};
 
 	if (index($range, '..') < 0) {
-		# don't show annoying git errrors to users who run -index
+		# don't show annoying git errors to users who run -index
 		# on empty inboxes
 		$git->qx(qw(rev-parse -q --verify), "$range^0");
 		if ($?) {