update copyrights for 2021

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

diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm
index 0ebc800314888827ea8778232cccc43aa6f5b6ee..06ea439d484f78bbd51350b6ce490f9b0ec43967 100644 (file)
--- a/lib/PublicInbox/Over.pm
+++ b/lib/PublicInbox/Over.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # for XOVER, OVER in NNTP, and feeds/homepage/threads in PSGI
@@ -6,7 +6,7 @@
 # tweaked/updated over time and rebuilt.
 package PublicInbox::Over;
 use strict;
-use warnings;
+use v5.10.1;
 use DBI;
 use DBD::SQLite;
 use PublicInbox::Smsg;
@@ -72,7 +72,7 @@ sub new {
        bless { filename => $f }, $class;
 }
 
-sub disconnect {
+sub dbh_close {
        my ($self) = @_;
        if (my $dbh = delete $self->{dbh}) {
                delete $self->{-get_art};
@@ -126,7 +126,7 @@ sub get_all {
        my $nr = scalar(@_) or return [];
        my $in = '?' . (',?' x ($nr - 1));
        do_get($self, <<"", { cull => 1, limit => $nr }, @_);
-SELECT num,ds,ddd FROM over WHERE num IN ($in)
+SELECT num,ts,ds,ddd FROM over WHERE num IN ($in)
 
 }
 
@@ -244,15 +244,9 @@ sub recent {
                        $s = '+num > 0 ORDER BY ts DESC';
                }
        }
-       my $msgs = do_get($self, <<"", $opts, @v);
+       do_get($self, <<"", $opts, @v);
 SELECT ts,ds,ddd FROM over WHERE $s
 
-       return $msgs unless wantarray;
-
-       my $nr = $self->{dbh}->selectrow_array(<<'');
-SELECT COUNT(num) FROM over WHERE num > 0
-
-       ($nr, $msgs);
 }
 
 sub get_art {
@@ -266,6 +260,27 @@ SELECT num,tid,ds,ts,ddd FROM over WHERE num = ? LIMIT 1
        $smsg ? load_from_row($smsg) : undef;
 }
 
+sub get_xref3 {
+       my ($self, $num, $raw) = @_;
+       my $dbh = dbh($self);
+       my $sth = $dbh->prepare_cached(<<'', undef, 1);
+SELECT ibx_id,xnum,oidbin FROM xref3 WHERE docid = ? ORDER BY ibx_id,xnum ASC
+
+       $sth->execute($num);
+       my $rows = $sth->fetchall_arrayref;
+       return $rows if $raw;
+       my $eidx_key_sth = $dbh->prepare_cached(<<'', undef, 1);
+SELECT eidx_key FROM inboxes WHERE ibx_id = ?
+
+       [ map {
+               my $r = $_;
+               $eidx_key_sth->execute($r->[0]);
+               my $eidx_key = $eidx_key_sth->fetchrow_array;
+               $eidx_key //= "missing://ibx_id=$r->[0]";
+               "$eidx_key:$r->[1]:".unpack('H*', $r->[2]);
+       } @$rows ];
+}
+
 sub next_by_mid {
        my ($self, $mid, $id, $prev) = @_;
        my $dbh = dbh($self);
@@ -328,7 +343,7 @@ sub check_inodes {
                my $st = pack('dd', $st[0], $st[1]);
 
                # don't actually reopen, just let {dbh} be recreated later
-               disconnect($self) if $st ne ($self->{st} // $st);
+               dbh_close($self) if $st ne ($self->{st} // $st);
        } else {
                warn "W: stat $f: $!\n";
        }