* [PATCH 3/3] ExtMsg: 300 to external mailing list archives
2015-09-03 1:57 6% [PATCH 0/3] improve external Message-ID handling Eric Wong
@ 2015-09-03 1:57 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2015-09-03 1:57 UTC (permalink / raw)
To: meta
Since cross-posting is inevitable, we shall link to external
message archives for interopability.
---
lib/PublicInbox/ExtMsg.pm | 30 ++++++++++++++++++++++++++++--
public-inbox.cgi | 1 +
t/cgi.t | 6 +++---
3 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index bdbff78..3e0e6e4 100644
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -7,6 +7,14 @@ use URI::Escape qw(uri_escape_utf8);
use PublicInbox::Hval;
use PublicInbox::MID qw/mid_compress mid2path/;
+# TODO: user-configurable
+our @EXT_URL = (
+ 'http://mid.gmane.org/%s',
+ 'https://lists.debian.org/msgid-search/%s',
+ 'http://mid.mail-archive.com/%s',
+ 'http://marc.info/?i=%s',
+);
+
sub ext_msg {
my ($ctx) = @_;
my $pi_config = $ctx->{pi_config};
@@ -74,9 +82,27 @@ sub ext_msg {
}
}
- # Fall back to external repos
+ my $code = 404;
+ my $h = PublicInbox::Hval->new_msgid($mid, 1);
+ my $href = $h->as_href;
+ my $html = $h->as_html;
+ my $title = "Message-ID <$html> not found";
+
+ # Fall back to external repos if configured
+ my $s = "<html><head><title>$title</title>" .
+ "</head><body><pre><b>$title</b>";
+
+ if (@EXT_URL) {
+ $code = 300;
+ $s .= "\n\nPerhaps try an external site:\n\n";
+ foreach my $u (@EXT_URL) {
+ my $r = sprintf($u, $href);
+ my $t = sprintf($u, $html);
+ $s .= qq{<a\nhref="$r">$t</a>\n};
+ }
+ }
- [404, ['Content-Type'=>'text/plain'], ['Not found']];
+ [300, ['Content-Type'=>'text/html; charset=UTF-8'], [$s]];
}
# Redirect to another public-inbox which is mapped by $pi_config
diff --git a/public-inbox.cgi b/public-inbox.cgi
index 1fcc04f..b095621 100755
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -17,6 +17,7 @@ BEGIN {
%HTTP_CODES = (
200 => 'OK',
+ 300 => 'Multiple Choices',
301 => 'Moved Permanently',
302 => 'Found',
404 => 'Not Found',
diff --git a/t/cgi.t b/t/cgi.t
index a6600c2..b0af8ae 100644
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -160,19 +160,19 @@ EOF
like($res->{body}, qr/Message-Id: <blahblah\@example\.com>/,
"mid raw hit");
$res = cgi_run("/test/blahblah\@example.con/raw");
- like($res->{head}, qr/Status: 404 Not Found/, "mid raw miss");
+ like($res->{head}, qr/Status: 300 Multiple Choices/, "mid raw miss");
$res = cgi_run("/test/blahblah\@example.com/");
like($res->{body}, qr/\A<html>/, "mid html hit");
like($res->{head}, qr/Status: 200 OK/, "200 response");
$res = cgi_run("/test/blahblah\@example.con/");
- like($res->{head}, qr/Status: 404 Not Found/, "mid html miss");
+ like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
$res = cgi_run("/test/blahblah\@example.com/f/");
like($res->{body}, qr/\A<html>/, "mid html");
like($res->{head}, qr/Status: 200 OK/, "200 response");
$res = cgi_run("/test/blahblah\@example.con/f/");
- like($res->{head}, qr/Status: 404 Not Found/, "mid html miss");
+ like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
$res = cgi_run("/test/");
like($res->{body}, qr/slashy%2Fasdf%40example\.com/,
--
EW
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] improve external Message-ID handling
@ 2015-09-03 1:57 6% Eric Wong
2015-09-03 1:57 7% ` [PATCH 3/3] ExtMsg: 300 to external mailing list archives Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2015-09-03 1:57 UTC (permalink / raw)
To: meta
Yet another Xapian schema change. We no longer compress Message-IDs
in Xapian, so looking for cross-posted messages in external archives
should be possible.
Eric Wong (3):
view: include ghost messages in thread views
search: disable Message-ID compression in Xapian
ExtMsg: 300 to external mailing list archives
lib/PublicInbox/ExtMsg.pm | 39 +++++++++++++++++++++++++------
lib/PublicInbox/Feed.pm | 29 ++++++++---------------
lib/PublicInbox/Search.pm | 6 ++---
lib/PublicInbox/SearchIdx.pm | 37 +++++++++++------------------
lib/PublicInbox/SearchMsg.pm | 4 ++--
lib/PublicInbox/View.pm | 55 ++++++++++++++++++++++++++++++++++++--------
public-inbox.cgi | 1 +
t/cgi.t | 6 ++---
t/search.t | 3 +--
9 files changed, 111 insertions(+), 69 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-09-03 1:57 6% [PATCH 0/3] improve external Message-ID handling Eric Wong
2015-09-03 1:57 7% ` [PATCH 3/3] ExtMsg: 300 to external mailing list archives Eric Wong
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).