No need to pass extra parameters to this method, since
smsg has universal meanings for {blob} and {mid}.
---
 lib/PublicInbox/OverIdx.pm   | 2 +-
 lib/PublicInbox/SearchIdx.pm | 4 +++-
 lib/PublicInbox/Smsg.pm      | 7 +++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index fd521bdd..9640f9d1 100644
--- 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 6e6c6424..c0578809 100644
--- 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 7a47703a..5eb0723f 100644
--- 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} // ''
        );
--
unsubscribe: one-click, see List-Unsubscribe header
archive: https://public-inbox.org/meta/

Reply via email to