X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FOverIdx.pm;h=f49dfa000431af739eb5e82060c5596fe1af5baf;hb=d34a4b80724e3f77a507ad08b91039427b0e09d5;hp=189bd21d93bc6731192dd26a333cc79f04b89c3e;hpb=e177c05afa9bdc5ca27bc2bd9f946b70290ca3f4;p=public-inbox.git
diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index 189bd21d..f49dfa00 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,13 +14,14 @@ 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 PublicInbox::MsgTime qw(msg_timestamp msg_datestamp);
use Compress::Zlib qw(compress);
use PublicInbox::Search;
sub dbh_new {
my ($self) = @_;
- my $dbh = $self->SUPER::dbh_new;
+ my $dbh = $self->SUPER::dbh_new(1);
$dbh->do('PRAGMA journal_mode = TRUNCATE');
$dbh->do('PRAGMA cache_size = 80000');
create_tables($dbh);
@@ -215,23 +216,20 @@ 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) {
warn "References: <$ref> too long, ignoring\n";
next;
}
- next if $seen{$ref}++;
- push @keep, $ref;
+ push(@keep, $ref) unless $seen{$ref}++;
}
$smsg->{references} = '<'.join('> <', @keep).'>' if @keep;
\@keep;
@@ -247,7 +245,7 @@ sub subject_path ($) {
}
sub add_overview {
- my ($self, $mime, $bytes, $num, $oid, $mid0) = @_;
+ my ($self, $mime, $bytes, $num, $oid, $mid0, $times) = @_;
my $lines = $mime->body_raw =~ tr!\n!\n!;
my $smsg = bless {
mime => $mime,
@@ -255,19 +253,22 @@ sub add_overview {
bytes => $bytes,
lines => $lines,
blob => $oid,
- }, 'PublicInbox::SearchMsg';
- my $mids = mids_for_index($mime->header_obj);
- my $refs = parse_references($smsg, $mid0, $mids);
+ }, 'PublicInbox::Smsg';
+ 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 ];
+ 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);
}