X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FAltId.pm;h=6d16242a33b041cfc00862b75df66266c20a12e3;hb=0d38f65c490466837ae091afa7a7b6f59d04ce7c;hp=f8aa4cb8cf71a244d369fc671bf3639d635acdb4;hpb=56489ee40e44255f2f9a00cd608bc366d2586306;p=public-inbox.git
diff --git a/lib/PublicInbox/AltId.pm b/lib/PublicInbox/AltId.pm
index f8aa4cb8..6d16242a 100644
--- a/lib/PublicInbox/AltId.pm
+++ b/lib/PublicInbox/AltId.pm
@@ -1,20 +1,28 @@
-# Copyright (C) 2016-2018 all contributors
+# Copyright (C) 2016-2020 all contributors
# License: AGPL-3.0+
+# Used for giving serial numbers to messages. This can be tied to
+# the msgmap for live updates to living lists (see
+# PublicInbox::Filters::RubyLang), or kept separate for imports
+# of defunct NNTP groups (e.g. scripts/xhdr-num2mid)
+#
+# Introducing NEW uses of serial numbers is discouraged because of
+# it leads to reliance on centralization. However, being able
+# to use existing serial numbers is beneficial.
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;
-
+ $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;
@@ -22,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;
}
@@ -39,7 +48,7 @@ sub mm_alt {
my ($self) = @_;
$self->{mm_alt} ||= eval {
my $f = $self->{filename};
- my $writable = $self->{filename};
+ my $writable = $self->{writable};
PublicInbox::Msgmap->new_file($f, $writable);
};
}