treewide: run update-copyrights from gnulib for 2019

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

diff --git a/lib/PublicInbox/AltId.pm b/lib/PublicInbox/AltId.pm
index 6103d52e7fba0a4768a0bad20e2d7071bec5b53e..8ce70e46042f0b7e1c38e2fe191ae2a58eb548a7 100644 (file)
--- a/lib/PublicInbox/AltId.pm
+++ b/lib/PublicInbox/AltId.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Used for giving serial numbers to messages.  This can be tied to
@@ -13,6 +13,7 @@ package PublicInbox::AltId;
 use strict;
 use warnings;
 use URI::Escape qw(uri_unescape);
+use PublicInbox::Msgmap;
 
 # spec: TYPE:PREFIX:param1=value1&param2=value2&...
 # The PREFIX will be a searchable boolean prefix in Xapian
@@ -22,8 +23,6 @@ sub new {
        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 (($ibx->{version} || 1) == 1) {
-                       $f = "$ibx->{mainrepo}/public-inbox/$f";
+               if ($ibx->version == 1) {
+                       $f = "$ibx->{inboxdir}/public-inbox/$f";
                } else {
-                       $f = "$ibx->{mainrepo}/$f";
+                       $f = "$ibx->{inboxdir}/$f";
                }
        }
        bless {