# 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};
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) {
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) {
}
}
- # 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).'>';
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);
$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 '';
}