smsg: to_doc_data: use existing fields

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

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 261deb84fd67fbdf5d2e8aa628d01caa6e90539c..c0578809231800b3fb77e01556ecb1c20bd4b672 100644 (file)
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -308,7 +308,7 @@ sub index_xapian { # msg_iter callback
 
 sub add_xapian ($$$$$$) {
        my ($self, $mime, $num, $oid, $mids, $mid0) = @_;
-       my $smsg = PublicInbox::SearchMsg->new($mime);
+       my $smsg = PublicInbox::Smsg->new($mime);
        my $hdr = $mime->header_obj;
        $smsg->{ds} = msg_datestamp($hdr, $self->{autime});
        $smsg->{ts} = msg_timestamp($hdr, $self->{cotime});
@@ -340,7 +340,9 @@ sub add_xapian ($$$$$$) {
        }
        $smsg->{to} = $smsg->{cc} = '';
        PublicInbox::OverIdx::parse_references($smsg, $mid0, $mids);
-       my $data = $smsg->to_doc_data($oid, $mid0);
+       $smsg->{blob} = $oid;
+       $smsg->{mid} = $mid0;
+       my $data = $smsg->to_doc_data;
        $doc->set_data($data);
        if (my $altid = $self->{-altid}) {
                foreach my $alt (@$altid) {
@@ -465,7 +467,7 @@ sub remove_by_oid {
        for (; $head != $tail; $head++) {
                my $docid = $head->get_docid;
                my $doc = $db->get_document($docid);
-               my $smsg = PublicInbox::SearchMsg->wrap($mid);
+               my $smsg = PublicInbox::Smsg->wrap($mid);
                $smsg->load_expand($doc);
                if ($smsg->{blob} eq $oid) {
                        push(@delete, $docid);