searchidx: use cached local $@ copy

[public-inbox.git] / lib / PublicInbox / SearchIdx.pm

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index bc003c6ca88be15b58ae96e28ee0e2cb700fd151..fd0d320e8685fe34c37b5f07162d3e81da2f0c06 100644 (file)
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -157,10 +157,6 @@ sub add_message {
                        # it will also clobber any existing regular message
                        $doc_id = $smsg->{doc_id};
                        $old_tid = $smsg->thread_id;
-
-                       # no need to remove_term for old_tid, we use a new
-                       # doc to replace the old one when reindexing:
-                       $old_tid = undef if $self->{reindex};
                }
                $smsg = PublicInbox::SearchMsg->new($mime);
                my $doc = $smsg->{doc};
@@ -295,17 +291,12 @@ sub link_message {
        my $mid = $smsg->mid;
        my $mime = $smsg->{mime};
        my $hdr = $mime->header_obj;
-       my $refs = $hdr->header_raw('References');
-       my @refs = defined $refs ? ($refs =~ /<([^>]+)>/g) : ();
-       my $irt = $hdr->header_raw('In-Reply-To');
-       if (defined $irt) {
-               if ($irt eq '') {
-                       $irt = undef;
-               } else {
-                       $irt = mid_clean($irt);
-                       $irt = undef if $mid eq $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) {
@@ -313,15 +304,6 @@ sub link_message {
                my @orig_refs = @refs;
                @refs = ();
 
-               if (defined $irt) {
-                       # to check MAX_MID_SIZE
-                       push @orig_refs, $irt;
-
-                       # below, we will ensure IRT (if specified)
-                       # is the last References
-                       $uniq{$irt} = 1;
-               }
-
                # prevent circular references via References: here:
                foreach my $ref (@orig_refs) {
                        if (length($ref) > MAX_MID_SIZE) {
@@ -333,10 +315,6 @@ sub link_message {
                }
        }
 
-       # last References should be IRT, but some mail clients do things
-       # out of order, so trust IRT over References iff IRT exists
-       push @refs, $irt if defined $irt;
-
        if (@refs) {
                $smsg->{references} = '<'.join('> <', @refs).'>';
 
@@ -352,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);
 }
@@ -468,7 +446,7 @@ sub _git_log {
 sub _index_sync {
        my ($self, $opts) = @_;
        my $tip = $opts->{ref} || 'HEAD';
-       $self->{reindex} = $opts->{reindex};
+       my $reindex = $opts->{reindex};
        my ($mkey, $last_commit, $lx, $xlog);
        $self->{git}->batch_prepare;
        my $xdb = _xdb_acquire($self);
@@ -478,7 +456,7 @@ sub _index_sync {
                $mkey = 'last_commit';
                $last_commit = $xdb->get_metadata('last_commit');
                $lx = $last_commit;
-               if ($self->{reindex}) {
+               if ($reindex) {
                        $lx = '';
                        $mkey = undef if $last_commit ne '';
                }
@@ -642,7 +620,7 @@ sub with_umask {
        my $rv = eval { $cb->() };
        my $err = $@;
        umask $old;
-       die $err if $@;
+       die $err if $err;
        $rv;
 }