We don't need to be carrying this around with the many SearchMsg
objects we have. This saves about 20K from a large SearchView
"&x=t" response.
sub add_xapian ($$$$$) {
my ($self, $mime, $num, $oid, $mids, $mid0) = @_;
my $smsg = PublicInbox::SearchMsg->new($mime);
sub add_xapian ($$$$$) {
my ($self, $mime, $num, $oid, $mids, $mid0) = @_;
my $smsg = PublicInbox::SearchMsg->new($mime);
- my $doc = $smsg->{doc};
+ my $doc = Search::Xapian::Document->new;
my $subj = $smsg->subject;
add_val($doc, PublicInbox::Search::TS(), $smsg->ts);
my @ds = gmtime($smsg->ds);
my $subj = $smsg->subject;
add_val($doc, PublicInbox::Search::TS(), $smsg->ts);
my @ds = gmtime($smsg->ds);
for (; $head != $tail; $head->inc) {
my $docid = $head->get_docid;
my $doc = $db->get_document($docid);
for (; $head != $tail; $head->inc) {
my $docid = $head->get_docid;
my $doc = $db->get_document($docid);
- my $smsg = PublicInbox::SearchMsg->wrap($doc, $mid);
- $smsg->load_expand;
+ my $smsg = PublicInbox::SearchMsg->wrap($mid);
+ $smsg->load_expand($doc);
if ($smsg->{blob} eq $oid) {
push(@delete, $docid);
}
if ($smsg->{blob} eq $oid) {
push(@delete, $docid);
}
sub new {
my ($class, $mime) = @_;
sub new {
my ($class, $mime) = @_;
- my $doc = Search::Xapian::Document->new;
- bless { doc => $doc, mime => $mime }, $class;
+ bless { mime => $mime }, $class;
- my ($class, $doc, $mid) = @_;
- bless { doc => $doc, mime => undef, mid => $mid }, $class;
+ my ($class, $mid) = @_;
+ bless { mid => $mid }, $class;
}
sub get {
my ($class, $head, $db, $mid) = @_;
my $doc_id = $head->get_docid;
}
sub get {
my ($class, $head, $db, $mid) = @_;
my $doc_id = $head->get_docid;
- my $doc = $db->get_document($doc_id);
- load_expand(wrap($class, $doc, $mid))
+ load_expand(wrap($class, $mid), $db->get_document($doc_id));
- my ($self) = @_;
- my $doc = $self->{doc};
my $data = $doc->get_data or return;
$self->{ts} = get_val($doc, PublicInbox::Search::TS());
my $dt = get_val($doc, PublicInbox::Search::DT());
my $data = $doc->get_data or return;
$self->{ts} = get_val($doc, PublicInbox::Search::TS());
my $dt = get_val($doc, PublicInbox::Search::DT());
sub load_doc {
my ($class, $doc) = @_;
sub load_doc {
my ($class, $doc) = @_;
- my $self = bless { doc => $doc }, $class;
- $self->load_expand;
+ my $self = bless {}, $class;
+ load_expand($self, $doc);
}
# :bytes and :lines metadata in RFC 3977
}
# :bytes and :lines metadata in RFC 3977
$self->{mid} = $mid;
} elsif (defined(my $rv = $self->{mid})) {
$rv;
$self->{mid} = $mid;
} elsif (defined(my $rv = $self->{mid})) {
$rv;
- } elsif ($self->{doc}) {
- die "SHOULD NOT HAPPEN\n";
} else {
die "NO {mime} for mid\n" unless $self->{mime};
$self->_extract_mid; # v1 w/o Xapian
} else {
die "NO {mime} for mid\n" unless $self->{mime};
$self->_extract_mid; # v1 w/o Xapian