From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 07/10] extmsg: switch to wwwstream for partial match, too
Date: Wed, 6 Jul 2016 07:14:32 +0000 [thread overview]
Message-ID: <20160706071435.18143-8-e@80x24.org> (raw)
In-Reply-To: <20160706071435.18143-1-e@80x24.org>
Another step towards a consistent WWW UI...
---
lib/PublicInbox/ExtMsg.pm | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 4925a59..019d50a 100644
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -104,14 +104,12 @@ again:
my $h = PublicInbox::Hval->new_msgid($mid);
my $href = $h->as_href;
my $html = $h->as_html;
- my $title = "Message-ID <$html> not found";
- my $s = "<html><head><title>$title</title>" .
- "</head><body><pre><b>$title</b>\n";
-
+ my $title = "<$html> not found";
+ my $s = "<pre>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";
foreach my $pair (@partial) {
my ($ibx, $res) = @$pair;
my $u = $ibx->base_url or next;
@@ -123,21 +121,15 @@ again:
}
}
}
-
- # 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{<a\nhref="$r">$t</a>\n};
- }
}
- $s .= '</pre></body></html>';
-
- [$code, ['Content-Type'=>'text/html; charset=UTF-8'], [$s]];
+ $ctx->{-html_tip} = $s .= '</pre>';
+ $ctx->{-title_html} = $title;
+ $ctx->{-upfx} = '../';
+ PublicInbox::WwwStream->response($ctx, $code);
}
sub ext_urls {
--
EW
next prev parent reply other threads:[~2016-07-06 7:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-06 7:14 [PATCH 0/10] various misc fixes and updates Eric Wong
2016-07-06 7:14 ` [PATCH 01/10] scripts/dc-dlvr: ensure temporary files are removed Eric Wong
2016-07-06 7:14 ` [PATCH 02/10] daemon: disable USR2/TTIN/TTOU/WINCH in workers Eric Wong
2016-07-06 7:14 ` [PATCH 03/10] hval: get rid of unused parameter for new_msgid Eric Wong
2016-07-06 7:14 ` [PATCH 04/10] address: attempt to handle comments somewhat Eric Wong
2016-07-06 7:14 ` [PATCH 05/10] wwwstream: allow undef noop callback Eric Wong
2016-07-06 7:14 ` [PATCH 06/10] extmsg: disable automatic inbox switching Eric Wong
2016-07-06 7:14 ` Eric Wong [this message]
2016-07-06 7:14 ` [PATCH 08/10] view: fix double-escaping of ghost links Eric Wong
2016-07-06 7:14 ` [PATCH 09/10] www: use HTML <hr> instead of XHTML <hr /> Eric Wong
2016-07-06 7:14 ` [PATCH 10/10] feed: fix links to attachments in Atom feed Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160706071435.18143-8-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).