#
# 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);
$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 ($$) {
$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;
}
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;
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;
+
+ # 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 $tg = $self->term_generator;
$tg->set_document($doc);
- if ($subj) {
- $tg->index_text($subj, 1, 'S');
- $tg->index_text($subj, 1, 'XBS');
- }
- $tg->increase_termpos;
- $tg->index_text($subj) if $subj;
+ $tg->index_text($subj, 1, 'S') 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) {
- my $s = join("\n", @quot);
- @quot = ();
- $tg->index_text($s, 1, 'XQUOT');
- $tg->index_text($s, 0, 'XBS');
- $tg->index_text($s, 0, 'XBODY');
- $tg->index_text($s, 0);
- $tg->increase_termpos;
- }
- if (@orig) {
- my $s = join("\n", @orig);
- @orig = ();
- $tg->index_text($s, 1, 'XNQ');
- $tg->index_text($s, 1, 'XBS');
- $tg->index_text($s, 1, 'XBODY');
- $tg->index_text($s);
- $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}) {
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);
+ 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;
+ }
}
my $tid;
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) {
push @refs, $ref;
}
}
+
+ # 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).'>';
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;
}
sub _index_sync {
my ($self, $opts) = @_;
my $tip = $opts->{ref} || 'HEAD';
- my $reindex = $opts->{reindex};
+ $self->{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 ($reindex) {
+ if ($self->{reindex}) {
$lx = '';
$mkey = undef if $last_commit ne '';
}