X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2FPublicInbox%2FOverIdx.pm;h=acbf2c8de6092742e10cdda77415812cbf6778d6;hb=b5bc3576af3d0ef0fa884ed32a674c7a703a19b2;hp=a966a71000c37ab4458675095d8c79cad9fe0172;hpb=253a86b7bf4a3d81118e91f4ebb77844cfbd2b32;p=public-inbox.git
diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index a966a710..acbf2c8d 100644
--- a/lib/PublicInbox/OverIdx.pm
+++ b/lib/PublicInbox/OverIdx.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 all contributors
+# Copyright (C) 2018-2020 all contributors
# License: AGPL-3.0+
# for XOVER, OVER in NNTP, and feeds/homepage/threads in PSGI
@@ -14,7 +14,7 @@ use base qw(PublicInbox::Over);
use IO::Handle;
use DBI qw(:sql_types); # SQL_BLOB
use PublicInbox::MID qw/id_compress mids_for_index references/;
-use PublicInbox::SearchMsg qw(subject_normalized);
+use PublicInbox::Smsg qw(subject_normalized);
use Compress::Zlib qw(compress);
use PublicInbox::Search;
@@ -215,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) {
@@ -246,28 +244,22 @@ sub subject_path ($) {
}
sub add_overview {
- my ($self, $mime, $bytes, $num, $oid, $mid0) = @_;
- my $lines = $mime->body_raw =~ tr!\n!\n!;
- my $smsg = bless {
- mime => $mime,
- mid => $mid0,
- bytes => $bytes,
- lines => $lines,
- blob => $oid,
- }, 'PublicInbox::SearchMsg';
- my $mids = mids_for_index($mime->header_obj);
- my $refs = parse_references($smsg, $mid0, $mids);
+ 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);
my $subj = $smsg->subject;
my $xpath;
if ($subj ne '') {
$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 $values = [ $smsg->ts, $smsg->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 {