X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FAltId.pm;h=80757ceba138b984369ed4935d14178bf59d64bc;hb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;hp=b4daaed2b64c56355ba539bebd60f1e173c7c350;hpb=3c39f9c942a6975245fda878e9b957d8d3367662;p=public-inbox.git
diff --git a/lib/PublicInbox/AltId.pm b/lib/PublicInbox/AltId.pm
index b4daaed2..80757ceb 100644
--- a/lib/PublicInbox/AltId.pm
+++ b/lib/PublicInbox/AltId.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors
+# Copyright (C) 2016-2021 all contributors
# License: AGPL-3.0+
# 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¶m2=value2&...
# The PREFIX will be a searchable boolean prefix in Xapian
@@ -21,9 +22,7 @@ sub new {
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,7 +30,7 @@ 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) {
+ if ($ibx->version == 1) {
$f = "$ibx->{inboxdir}/public-inbox/$f";
} else {
$f = "$ibx->{inboxdir}/$f";
@@ -40,6 +39,7 @@ sub new {
bless {
filename => $f,
writable => $writable,
+ prefix => $prefix,
xprefix => 'X'.uc($prefix),
}, $class;
}