wwwstream: improve documentation and variable naming

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

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 2a9316b1f2c12e466000d62f37f2cf02cb5c6fff..67ce04071a638c68b7e648cc418ea47b02e55359 100644 (file)
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -14,11 +14,16 @@ 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',
+       '//mid.mail-archive.com/%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 {
@@ -100,7 +105,7 @@ 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 = "<$html> not found";
        my $s = "<pre>Message-ID &lt;$html&gt;\nnot found\n";
@@ -108,12 +113,14 @@ again:
                $code = 300;
                my $es = $n_partial == 1 ? '' : 'es';
                $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{<a\nhref="$u$r/">$u$t/</a>\n};
                        }
@@ -151,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 = "&lt;$html&gt; found in ";
        my $end = @$found == 1 ? 'another inbox' : 'other inboxes';