X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FExtMsg.pm;h=6cfc6c322295d2f6f3515de38db75e48e0dfff25;hb=b7ad68f80356124f08e93ead6a575375f726291f;hp=4925a592430ef608b44e8c91568d02084ca2379e;hpb=54fd19fc1ecb0bca805ed101416b8b0bb0a4c5d3;p=public-inbox.git
diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 4925a592..6cfc6c32 100644
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -14,25 +14,28 @@ use PublicInbox::WwwStream;
# TODO: user-configurable
our @EXT_URL = (
- 'http://mid.gmane.org/%s',
- 'https://lists.debian.org/msgid-search/%s',
# leading "//" denotes protocol-relative (http:// or https://)
- '//mid.mail-archive.com/%s',
'//marc.info/?i=%s',
+ '//www.mail-archive.com/search?l=mid&q=%s',
+ 'http://mid.gmane.org/%s',
+ 'https://lists.debian.org/msgid-search/%s',
+ '//docs.FreeBSD.org/cgi/mid.cgi?db=mid&id=%s',
+ 'https://www.w3.org/mid/%s',
+ 'http://www.postgresql.org/message-id/%s',
+ 'https://lists.debconf.org/cgi-lurker/keyword.cgi?'.
+ 'doc-url=/lurker&format=en.html&query=id:%s'
);
sub ext_msg {
my ($ctx) = @_;
- my $pi_config = $ctx->{pi_config};
my $cur = $ctx->{-inbox};
my $mid = $ctx->{mid};
- my $env = $ctx->{env};
eval { require PublicInbox::Search };
my $have_xap = $@ ? 0 : 1;
my (@nox, @ibx, @found);
- $pi_config->each_inbox(sub {
+ $ctx->{www}->{pi_config}->each_inbox(sub {
my ($other) = @_;
return if $other->{name} eq $cur->{name} || !$other->base_url;
@@ -102,42 +105,36 @@ again:
my $code = 404;
my $h = PublicInbox::Hval->new_msgid($mid);
- my $href = $h->as_href;
+ my $href = $h->{href};
my $html = $h->as_html;
- my $title = "Message-ID <$html> not found";
- my $s = "$title" .
- "$title\n";
-
+ my $title = "<$html> not found";
+ my $s = "Message-ID <$html>\nnot found\n";
if ($n_partial) {
$code = 300;
my $es = $n_partial == 1 ? '' : 'es';
- $s.= "\n$n_partial partial match$es found:\n\n";
+ $s .= "\n$n_partial partial match$es found:\n\n";
+ my $cur_name = $cur->{name};
foreach my $pair (@partial) {
my ($ibx, $res) = @$pair;
- my $u = $ibx->base_url or next;
+ my $env = $ctx->{env} if $ibx->{name} eq $cur_name;
+ my $u = $ibx->base_url($env) or next;
foreach my $m (@$res) {
my $p = PublicInbox::Hval->new_msgid($m);
- my $r = $p->as_href;
+ my $r = $p->{href};
my $t = $p->as_html;
$s .= qq{$u$t/\n};
}
}
}
-
- # Fall back to external repos if configured
- if (@EXT_URL && index($mid, '@') >= 0) {
+ my $ext = ext_urls($ctx, $mid, $href, $html);
+ if ($ext ne '') {
+ $s .= $ext;
$code = 300;
- $s .= "\nPerhaps try an external site:\n\n";
- foreach my $url (@EXT_URL) {
- my $u = PublicInbox::Hval::prurl($env, $url);
- my $r = sprintf($u, $href);
- my $t = sprintf($u, $html);
- $s .= qq{$t\n};
- }
}
- $s .= '';
-
- [$code, ['Content-Type'=>'text/html; charset=UTF-8'], [$s]];
+ $ctx->{-html_tip} = $s .= '
';
+ $ctx->{-title_html} = $title;
+ $ctx->{-upfx} = '../';
+ PublicInbox::WwwStream->response($ctx, $code);
}
sub ext_urls {
@@ -161,7 +158,7 @@ sub ext_urls {
sub exact {
my ($ctx, $found, $mid) = @_;
my $h = PublicInbox::Hval->new_msgid($mid);
- my $href = $h->as_href;
+ my $href = $h->{href};
my $html = $h->as_html;
my $title = "<$html> found in ";
my $end = @$found == 1 ? 'another inbox' : 'other inboxes';