X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FOver.pm;h=0957cbdd78cca6290832f93e25b7203977904456;hb=6e2da35b9e9e5510e3156b07e91ebc835146758c;hp=0ebc800314888827ea8778232cccc43aa6f5b6ee;hpb=1814b1a0b78770c8ba9e7a0adef56c4c324d4064;p=public-inbox.git diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm index 0ebc8003..0957cbdd 100644 --- a/lib/PublicInbox/Over.pm +++ b/lib/PublicInbox/Over.pm @@ -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}; @@ -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 { @@ -328,7 +322,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"; }