*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 9640f9d13bf57b1e9ae23d48bf9c7c41930b3b4b..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;
 
@@ -216,15 +215,13 @@ sub link_refs {
 }
 
 sub parse_references ($$$) {
-       my ($smsg, $mid0, $mids) = @_;
-       my $mime = $smsg->{mime};
-       my $hdr = $mime->header_obj;
+       my ($smsg, $hdr, $mids) = @_;
        my $refs = references($hdr);
        push(@$refs, @$mids) if scalar(@$mids) > 1;
        return $refs if scalar(@$refs) == 0;
 
        # prevent circular references here:
-       my %seen = ( $mid0 => 1 );
+       my %seen = ( $smsg->{mid} => 1 );
        my @keep;
        foreach my $ref (@$refs) {
                if (length($ref) > PublicInbox::MID::MAX_MID_SIZE) {
@@ -247,18 +244,12 @@ 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, $mid0, $mids);
+       my $refs = parse_references($smsg, $hdr, $mids);
        my $subj = $smsg->subject;
        my $xpath;
        if ($subj ne '') {
@@ -268,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 {