smsg: to_doc_data: use existing fields

No need to pass extra parameters to this method, since
smsg has universal meanings for {blob} and {mid}.

diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index fd521bdd1e20a62f5a38e8c5308663b104fadb7f..9640f9d13bf57b1e9ae23d48bf9c7c41930b3b4b 100644 (file)
--- a/lib/PublicInbox/OverIdx.pm
+++ b/lib/PublicInbox/OverIdx.pm
@@ -265,7 +265,7 @@ sub add_overview {
                $xpath = subject_path($subj);
                $xpath = id_compress($xpath);
        }
-       my $dd = $smsg->to_doc_data($oid, $mid0);
+       my $dd = $smsg->to_doc_data;
        utf8::encode($dd);
        $dd = compress($dd);
        my $ds = msg_timestamp($hdr, $times->{autime});

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 6e6c6424a2468e3e3051ee270aa72813d906c15a..c0578809231800b3fb77e01556ecb1c20bd4b672 100644 (file)
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -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) {

diff --git a/lib/PublicInbox/Smsg.pm b/lib/PublicInbox/Smsg.pm
index 7a47703a25054158c4f1ef12f61cad87ef7a1627..5eb0723f4257995832b7ba21c6fe8218f9f48a4e 100644 (file)
--- a/lib/PublicInbox/Smsg.pm
+++ b/lib/PublicInbox/Smsg.pm
@@ -34,16 +34,15 @@ sub get_val ($$) {
 }
 
 sub to_doc_data {
-       my ($self, $oid, $mid0) = @_;
-       $oid = '' unless defined $oid;
+       my ($self) = @_;
        join("\n",
                $self->subject,
                $self->from,
                $self->references,
                $self->to,
                $self->cc,
-               $oid,
-               $mid0,
+               $self->{blob},
+               $self->{mid},
                $self->{bytes} // '',
                $self->{lines} // ''
        );