*idx: pass smsg in even more places

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

diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index f49dfa000431af739eb5e82060c5596fe1af5baf..acbf2c8de6092742e10cdda77415812cbf6778d6 100644 (file)
--- a/lib/PublicInbox/OverIdx.pm
+++ b/lib/PublicInbox/OverIdx.pm
@@ -15,7 +15,6 @@ use IO::Handle;
 use DBI qw(:sql_types); # SQL_BLOB
 use PublicInbox::MID qw/id_compress mids_for_index references/;
 use PublicInbox::Smsg qw(subject_normalized);
-use PublicInbox::MsgTime qw(msg_timestamp msg_datestamp);
 use Compress::Zlib qw(compress);
 use PublicInbox::Search;
 
@@ -245,15 +244,9 @@ sub subject_path ($) {
 }
 
 sub add_overview {
-       my ($self, $mime, $bytes, $num, $oid, $mid0, $times) = @_;
-       my $lines = $mime->body_raw =~ tr!\n!\n!;
-       my $smsg = bless {
-               mime => $mime,
-               mid => $mid0,
-               bytes => $bytes,
-               lines => $lines,
-               blob => $oid,
-       }, 'PublicInbox::Smsg';
+       my ($self, $mime, $smsg) = @_;
+       $smsg->{lines} = $mime->body_raw =~ tr!\n!\n!;
+       $smsg->{mime} = $mime; # XXX temporary?
        my $hdr = $mime->header_obj;
        my $mids = mids_for_index($hdr);
        my $refs = parse_references($smsg, $hdr, $mids);
@@ -266,10 +259,7 @@ sub add_overview {
        my $dd = $smsg->to_doc_data;
        utf8::encode($dd);
        $dd = compress($dd);
-       my $ds = msg_timestamp($hdr, $times->{autime});
-       my $ts = msg_datestamp($hdr, $times->{cotime});
-       my $values = [ $ts, $ds, $num, $mids, $refs, $xpath, $dd ];
-       add_over($self, $values);
+       add_over($self, [ @$smsg{qw(ts ds num)}, $mids, $refs, $xpath, $dd ]);
 }
 
 sub add_over {