www: add endpoint to retrieve altid dumps

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

diff --git a/lib/PublicInbox/AltId.pm b/lib/PublicInbox/AltId.pm
index 300bdc0b49fbda3d561c4037ab812ce732ac79b1..6d16242a33b041cfc00862b75df66266c20a12e3 100644 (file)
--- a/lib/PublicInbox/AltId.pm
+++ b/lib/PublicInbox/AltId.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2018 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,17 +13,16 @@ 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
 # 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;
-
+       $prefix =~ /\A\w+\z/ or warn "non-word prefix not searchable\n";
        my %params = map {
                my ($k, $v) = split(/=/, uri_unescape($_), 2);
                $v = '' unless defined $v;
@@ -31,15 +30,16 @@ 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 {
                filename => $f,
                writable => $writable,
+               prefix => $prefix,
                xprefix => 'X'.uc($prefix),
        }, $class;
 }