X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearch.pm;h=7f901125057275376041a59ecf5ec69eba6206b0;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=5c9dccb53af327282d10df960f7f112801986e58;hpb=55b707d788ce13696e4411389583e720ea6dab01;p=public-inbox.git
diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 5c9dccb5..7f901125 100644
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 all contributors
+# Copyright (C) 2015-2020 all contributors
# License: AGPL-3.0+
# based on notmuch, but with no concept of folders, files or flags
#
@@ -148,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;
@@ -165,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);
@@ -198,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");