From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 2D51E1F61F for ; Fri, 20 Mar 2020 08:18:22 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 4/9] smsg: to_doc_data: use existing fields Date: Fri, 20 Mar 2020 08:18:16 +0000 Message-Id: <20200320081821.21715-5-e@yhbt.net> In-Reply-To: <20200320081821.21715-1-e@yhbt.net> References: <20200320081821.21715-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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} // '' );