X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearch.pm;h=88c8dc70e17c3bedf3883f07555894b6c54eb7c3;hb=7375e589c165cd0c5bae2d70ff8e279fb76216a2;hp=60fc861ab63da8c2b07d612c5a9ca0d6160630fe;hpb=c477bdd8a80eecc319b680764edfb24bd12cb7b2;p=public-inbox.git

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 60fc861a..88c8dc70 100644
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2019 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
 #
@@ -54,6 +54,9 @@ use constant {
 	# 13 - fix threading for empty References/In-Reply-To
 	#      (commit 83425ef12e4b65cdcecd11ddcb38175d4a91d5a0)
 	# 14 - fix ghost root vivification
+	# 15 - see public-inbox-v2-format(5)
+	#      further bumps likely unnecessary, we'll suggest in-place
+	#      "--reindex" use for further fixes and tweaks
 	SCHEMA_VERSION => 15,
 };
 
@@ -126,9 +129,9 @@ chomp @HELP;
 sub xdir ($;$) {
 	my ($self, $rdonly) = @_;
 	if ($self->{version} == 1) {
-		"$self->{mainrepo}/public-inbox/xapian" . SCHEMA_VERSION;
+		"$self->{inboxdir}/public-inbox/xapian" . SCHEMA_VERSION;
 	} else {
-		my $dir = "$self->{mainrepo}/xap" . SCHEMA_VERSION;
+		my $dir = "$self->{inboxdir}/xap" . SCHEMA_VERSION;
 		return $dir if $rdonly;
 
 		my $shard = $self->{shard};
@@ -173,7 +176,7 @@ sub new {
 	my ($class, $ibx) = @_;
 	ref $ibx or die "BUG: expected PublicInbox::Inbox object: $ibx";
 	my $self = bless {
-		mainrepo => $ibx->{mainrepo},
+		inboxdir => $ibx->{inboxdir},
 		altid => $ibx->{altid},
 		version => $ibx->{version} // 1,
 	}, $class;