searchidxshard: replace index_raw with index_eml

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

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 885edbe9170938a46cf42105619546f365d711d8..7b6b93a0d124baf8635cf13fc8d6ecc08221980d 100644 (file)
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -140,11 +140,11 @@ sub idx_shard ($$) {
 
 # indexes a message, returns true if checkpointing is needed
 sub do_idx ($$$$) {
-       my ($self, $msgref, $mime, $smsg) = @_;
+       my ($self, $msgref, $eml, $smsg) = @_;
        $smsg->{bytes} = $smsg->{raw_bytes} + crlf_adjust($$msgref);
-       $self->{oidx}->add_overview($mime, $smsg);
+       $self->{oidx}->add_overview($eml, $smsg);
        my $idx = idx_shard($self, $smsg->{num});
-       $idx->index_raw($msgref, $mime, $smsg);
+       $idx->index_eml($eml, $smsg);
        my $n = $self->{transact_bytes} += $smsg->{raw_bytes};
        $n >= $self->{batch_bytes};
 }
@@ -173,8 +173,7 @@ sub _add {
        $cmt = $im->get_mark($cmt);
        $self->{last_commit}->[$self->{epoch_max}] = $cmt;
 
-       my $msgref = delete $smsg->{-raw_email};
-       if (do_idx($self, $msgref, $mime, $smsg)) {
+       if (do_idx($self, delete $smsg->{-raw_email}, $mime, $smsg)) {
                $self->checkpoint;
        }
 
@@ -1219,7 +1218,7 @@ sub index_xap_only { # git->cat_async callback
        my $self = $smsg->{self};
        my $idx = idx_shard($self, $smsg->{num});
        $smsg->{raw_bytes} = $size;
-       $idx->index_raw($bref, undef, $smsg);
+       $idx->index_eml(PublicInbox::Eml->new($bref), $smsg);
        $self->{transact_bytes} += $size;
 }