diff options
| -rw-r--r-- | lib/PublicInbox/Search.pm | 6 | ||||
| -rw-r--r-- | lib/PublicInbox/SearchIdx.pm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index 5e820594..a4491ca1 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -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, + ibx_ver => $ibx->version, }, $class; my $dir = xdir($self, 1); $self->{over_ro} = PublicInbox::Over->new("$dir/over.sqlite3"); diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm index 4e951bbe..4349d127 100644 --- a/lib/PublicInbox/SearchIdx.pm +++ b/lib/PublicInbox/SearchIdx.pm @@ -54,7 +54,7 @@ sub new { -inbox => $ibx, git => $ibx->git, -altid => $altid, - version => $version, + ibx_ver => $version, indexlevel => $indexlevel, }, $class; $ibx->umask_prepare; @@ -358,7 +358,7 @@ sub add_xapian ($$$$$$) { sub _msgmap_init ($) { my ($self) = @_; - die "BUG: _msgmap_init is only for v1\n" if $self->{version} != 1; + die "BUG: _msgmap_init is only for v1\n" if $self->{ibx_ver} != 1; $self->{mm} //= eval { require PublicInbox::Msgmap; PublicInbox::Msgmap->new($self->{inboxdir}, 1); |