use warnings;
use Fcntl qw(:flock :DEFAULT);
use PublicInbox::MIME;
-use Email::MIME::ContentType;
-$Email::MIME::ContentType::STRICT_PARAMS = 0;
use base qw(PublicInbox::Search);
use PublicInbox::MID qw/mid_clean id_compress mid_mime/;
use PublicInbox::MsgIter;
$doc->add_value($col, $num);
}
-sub add_values ($$$$) {
- my ($smsg, $bytes, $num, $lines) = @_;
+sub add_values ($$) {
+ my ($doc, $values) = @_;
- my $ts = $smsg->ts;
- my $doc = $smsg->{doc};
- add_val($doc, &PublicInbox::Search::TS, $ts);
+ my $ts = $values->[PublicInbox::Search::TS];
+ add_val($doc, PublicInbox::Search::TS, $ts);
- defined($num) and add_val($doc, &PublicInbox::Search::NUM, $num);
+ my $num = $values->[PublicInbox::Search::NUM];
+ defined($num) and add_val($doc, PublicInbox::Search::NUM, $num);
- defined($bytes) and add_val($doc, &PublicInbox::Search::BYTES, $bytes);
+ my $bytes = $values->[PublicInbox::Search::BYTES];
+ defined($bytes) and add_val($doc, PublicInbox::Search::BYTES, $bytes);
- add_val($doc, &PublicInbox::Search::LINES, $lines);
+ my $lines = $values->[PublicInbox::Search::LINES];
+ add_val($doc, PublicInbox::Search::LINES, $lines);
my $yyyymmdd = strftime('%Y%m%d', gmtime($ts));
add_val($doc, PublicInbox::Search::YYYYMMDD, $yyyymmdd);
my ($doc_id, $old_tid);
my $mid = mid_clean(mid_mime($mime));
- my $threader = $self->{threader};
+ my $skel = $self->{skeleton};
eval {
die 'Message-ID too long' if length($mid) > MAX_MID_SIZE;
# convert a ghost to a regular message
# it will also clobber any existing regular message
$doc_id = $smsg->{doc_id};
- $old_tid = $smsg->thread_id unless $threader;
+ $old_tid = $smsg->thread_id unless $skel;
}
$smsg = PublicInbox::SearchMsg->new($mime);
my $doc = $smsg->{doc};
}
my $lines = $mime->body_raw =~ tr!\n!\n!;
- add_values($smsg, $bytes, $num, $lines);
+ my @values = ($smsg->ts, $num, $bytes, $lines);
+ add_values($doc, \@values);
my $tg = $self->term_generator;
# populates smsg->references for smsg->to_doc_data
my $refs = parse_references($smsg);
my $data = $smsg->to_doc_data($blob);
- if ($threader) {
- $threader->thread_msg($mid, $smsg->ts, $xpath, $data);
+ if ($skel) {
+ push @values, $mid, $xpath, $data;
+ $skel->index_skeleton(\@values);
} else {
link_message($self, $smsg, $refs, $old_tid);
}
$smsg->{doc}->add_term('G' . $tid);
}
-sub index_blob {
- my ($self, $mime, $bytes, $num, $blob) = @_;
- $self->add_message($mime, $bytes, $num, $blob);
-}
-
sub index_git_blob_id {
my ($doc, $pfx, $objid) = @_;
sub index_mm2 {
my ($self, $mime, $bytes, $blob) = @_;
my $num = $self->{mm}->num_for(mid_clean(mid_mime($mime)));
- index_blob($self, $mime, $bytes, $num, $blob);
+ add_message($self, $mime, $bytes, $num, $blob);
}
sub unindex_mm2 {
sub index_both {
my ($self, $mime, $bytes, $blob) = @_;
my $num = index_mm($self, $mime);
- index_blob($self, $mime, $bytes, $num, $blob);
+ add_message($self, $mime, $bytes, $num, $blob);
}
sub unindex_both {
}
} else {
# user didn't install DBD::SQLite and DBI
- rlog($self, $xlog, *index_blob, *unindex_blob, $cb);
+ rlog($self, $xlog, *add_message, *unindex_blob, $cb);
}
}
$_[0]->{lockfh} = undef;
}
-# remote_* subs are only used by SearchIdxPart and SearchIdxThread:
+# remote_* subs are only used by SearchIdxPart and SearchIdxSkeleton
sub remote_commit {
my ($self) = @_;
print { $self->{w} } "commit\n" or die "failed to write commit: $!";