X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FAltId.pm;h=5add1ea255dd198440e47ad7e28c07aaaa9bb098;hb=227a1d886672767e37cc86a3432952c14eb8a143;hp=300bdc0b49fbda3d561c4037ab812ce732ac79b1;hpb=b0e5062d43a96372801713ef78a78d6a1bc852bc;p=public-inbox.git
diff --git a/lib/PublicInbox/AltId.pm b/lib/PublicInbox/AltId.pm
index 300bdc0b..5add1ea2 100644
--- a/lib/PublicInbox/AltId.pm
+++ b/lib/PublicInbox/AltId.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2018 all contributors
+# Copyright (C) 2016-2019 all contributors
# License: AGPL-3.0+
# Used for giving serial numbers to messages. This can be tied to
@@ -13,17 +13,16 @@ package PublicInbox::AltId;
use strict;
use warnings;
use URI::Escape qw(uri_unescape);
+use PublicInbox::Msgmap;
# spec: TYPE:PREFIX:param1=value1¶m2=value2&...
# The PREFIX will be a searchable boolean prefix in Xapian
# Example: serial:gmane:file=/path/to/altmsgmap.sqlite3
sub new {
- my ($class, $inbox, $spec, $writable) = @_;
+ my ($class, $ibx, $spec, $writable) = @_;
my ($type, $prefix, $query) = split(/:/, $spec, 3);
$type eq 'serial' or die "non-serial not supported, yet\n";
- require PublicInbox::Msgmap;
-
my %params = map {
my ($k, $v) = split(/=/, uri_unescape($_), 2);
$v = '' unless defined $v;
@@ -31,10 +30,10 @@ sub new {
} split(/[&;]/, $query);
my $f = $params{file} or die "file: required for $type spec $spec\n";
unless (index($f, '/') == 0) {
- if (($inbox->{version} || 1) == 1) {
- $f = "$inbox->{mainrepo}/public-inbox/$f";
+ if ($ibx->version == 1) {
+ $f = "$ibx->{inboxdir}/public-inbox/$f";
} else {
- $f = "$inbox->{mainrepo}/$f";
+ $f = "$ibx->{inboxdir}/$f";
}
}
bless {