X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FExtMsg.pm;h=47f00b5e3ec179f4167deffd433c56b56b712c25;hb=789f1c6718481eec59a8c7add6025b8e85040aa9;hp=51e7799de8640929be9538713d3f2ee7e1b1081d;hpb=a46893a2b5dabfdbcf7b593ac19967daecfb1772;p=public-inbox.git

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 51e7799d..47f00b5e 100644
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used by the web interface to link to messages outside of the our
@@ -8,12 +8,13 @@
 package PublicInbox::ExtMsg;
 use strict;
 use warnings;
-use PublicInbox::Hval;
+use PublicInbox::Hval qw/ascii_html/;
 use PublicInbox::MID qw/mid2path/;
 use PublicInbox::WwwStream;
+our $MIN_PARTIAL_LEN = 16;
 
 # TODO: user-configurable
-our @EXT_URL = (
+our @EXT_URL = map { ascii_html($_) } (
 	# leading "//" denotes protocol-relative (http:// or https://)
 	'//marc.info/?i=%s',
 	'//www.mail-archive.com/search?l=mid&q=%s',
@@ -30,6 +31,7 @@ sub PARTIAL_MAX () { 100 }
 
 sub search_partial ($$) {
 	my ($srch, $mid) = @_;
+	return if length($mid) < $MIN_PARTIAL_LEN;
 	my $opt = { limit => PARTIAL_MAX, mset => 2 };
 	my @try = ("m:$mid*");
 	my $chop = $mid;
@@ -58,12 +60,12 @@ sub search_partial ($$) {
 	}
 
 	foreach my $m (@try) {
-		my $mset = eval { $srch->query($m, $opt) };
-		if (ref($@) eq 'Search::Xapian::QueryParserError') {
-			# If Xapian can't handle the wildcard since it
-			# has too many results.
-			next;
-		}
+		# If Xapian can't handle the wildcard since it
+		# has too many results.  $@ can be
+		# Search::Xapian::QueryParserError or even:
+		# "something terrible happened at ../Search/Xapian/Enquire.pm"
+		my $mset = eval { $srch->query($m, $opt) } or next;
+
 		my @mids = map {
 			my $doc = $_->get_document;
 			PublicInbox::SearchMsg->load_doc($doc)->mid;
@@ -78,7 +80,6 @@ sub ext_msg {
 	my $mid = $ctx->{mid};
 
 	eval { require PublicInbox::Msgmap };
-	my $have_mm = $@ ? 0 : 1;
 	my (@ibx, @found);
 
 	$ctx->{www}->{pi_config}->each_inbox(sub {
@@ -112,7 +113,7 @@ sub ext_msg {
 	}
 
 	# can't find a partial match in current inbox, try the others:
-	if (!$n_partial && length($mid) >= 16) {
+	if (!$n_partial && length($mid) >= $MIN_PARTIAL_LEN) {
 		foreach my $ibx (@ibx) {
 			$srch = $ibx->search or next;
 			$mids = search_partial($srch, $mid) or next;