treewide: run update-copyrights from gnulib for 2019

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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index eb1a1446b6f10f4552431f99253d87f2608f06be..7f901125057275376041a59ecf5ec69eba6206b0 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # based on notmuch, but with no concept of folders, files or flags
 #
@@ -13,8 +13,6 @@ use constant YYYYMMDD => 1; # Date: header for searching in the WWW UI
 use constant DT => 2; # Date: YYYYMMDDHHMMSS
 
 use PublicInbox::SearchMsg;
-use PublicInbox::MIME;
-use PublicInbox::MID qw/id_compress/;
 use PublicInbox::Over;
 my $QP_FLAGS;
 our %X = map { $_ => 0 } qw(BoolWeight Database Enquire
@@ -49,7 +47,7 @@ sub load_xapian () {
                # or make indexlevel=medium as default
                $QP_FLAGS = FLAG_PHRASE() | FLAG_BOOLEAN() | FLAG_LOVEHATE() |
                                FLAG_WILDCARD();
-               last;
+               return 1;
        }
        undef;
 }
@@ -150,7 +148,7 @@ chomp @HELP;
 
 sub xdir ($;$) {
        my ($self, $rdonly) = @_;
-       if ($self->{version} == 1) {
+       if ($self->{ibx_ver} == 1) {
                "$self->{inboxdir}/public-inbox/xapian" . SCHEMA_VERSION;
        } else {
                my $dir = "$self->{inboxdir}/xap" . SCHEMA_VERSION;
@@ -167,7 +165,7 @@ sub _xdb ($) {
        my $dir = xdir($self, 1);
        my ($xdb, $slow_phrase);
        my $qpf = \($self->{qp_flags} ||= $QP_FLAGS);
-       if ($self->{version} >= 2) {
+       if ($self->{ibx_ver} >= 2) {
                foreach my $shard (<$dir/*>) {
                        -d $shard && $shard =~ m!/[0-9]+\z! or next;
                        my $sub = $X{Database}->new($shard);
@@ -200,7 +198,7 @@ sub new {
        my $self = bless {
                inboxdir => $ibx->{inboxdir},
                altid => $ibx->{altid},
-               version => $ibx->{version} // 1,
+               ibx_ver => $ibx->version,
        }, $class;
        my $dir = xdir($self, 1);
        $self->{over_ro} = PublicInbox::Over->new("$dir/over.sqlite3");
@@ -336,11 +334,6 @@ EOF
        $self->{query_parser} = $qp;
 }
 
-sub lookup_article {
-       my ($self, $num) = @_;
-       $self->{over_ro}->get_art($num);
-}
-
 sub help {
        my ($self) = @_;
        $self->qp; # parse altids