X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FExtMsg.pm;h=5dffc65c9150f04db7ad2bde10c9921fc95075fd;hb=80b887f29b2ec71d025b4c266a1c26314758994c;hp=44884ad286354aa9a95841fb5b3b171df0d19cc2;hpb=1fee6f86d7ee78161cc48a00232654f13a14bb88;p=public-inbox.git

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 44884ad2..5dffc65c 100644
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -9,7 +9,8 @@ package PublicInbox::ExtMsg;
 use strict;
 use warnings;
 use PublicInbox::Hval qw(ascii_html prurl mid_href);
-use PublicInbox::WwwStream;
+use PublicInbox::WwwStream qw(html_oneshot);
+use PublicInbox::Smsg;
 our $MIN_PARTIAL_LEN = 16;
 
 # TODO: user-configurable
@@ -28,13 +29,10 @@ our @EXT_URL = map { ascii_html($_) } (
 
 sub PARTIAL_MAX () { 100 }
 
-sub mids_from_mset { # Search::retry_reopen callback
-	[ map { PublicInbox::SearchMsg::from_mitem($_)->mid } $_[0]->items ];
-}
-
 sub search_partial ($$) {
-	my ($srch, $mid) = @_;
+	my ($ibx, $mid) = @_;
 	return if length($mid) < $MIN_PARTIAL_LEN;
+	my $srch = $ibx->search or return;
 	my $opt = { limit => PARTIAL_MAX, mset => 2 };
 	my @try = ("m:$mid*");
 	my $chop = $mid;
@@ -67,9 +65,11 @@ sub search_partial ($$) {
 		# 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 = $srch->retry_reopen(\&mids_from_mset, $mset);
-		return $mids if scalar(@$mids);
+		my $mset = eval { $srch->mset($m, $opt) } or next;
+		my @mids = map {
+			$_->{mid}
+		} @{$srch->mset_to_smsg($ibx, $mset)};
+		return \@mids if scalar(@mids);
 	}
 }
 
@@ -110,8 +110,7 @@ sub ext_msg {
 	# fall back to partial MID matching
 	my @partial;
 	my $n_partial = 0;
-	my $srch = $cur->search;
-	my $mids = search_partial($srch, $mid) if $srch;
+	my $mids = search_partial($cur, $mid);
 	if ($mids) {
 		$n_partial = scalar(@$mids);
 		push @partial, [ $cur, $mids ];
@@ -120,8 +119,7 @@ sub ext_msg {
 	# can't find a partial match in current inbox, try the others:
 	if (!$n_partial && length($mid) >= $MIN_PARTIAL_LEN) {
 		foreach my $ibx (@$ibxs) {
-			$srch = $ibx->search or next;
-			$mids = search_partial($srch, $mid) or next;
+			$mids = search_partial($ibx, $mid) or next;
 			$n_partial += scalar(@$mids);
 			push @partial, [ $ibx, $mids];
 			last if $n_partial >= PARTIAL_MAX;
@@ -158,7 +156,7 @@ sub ext_msg {
 	$ctx->{-html_tip} = $s .= '</pre>';
 	$ctx->{-title_html} = $title;
 	$ctx->{-upfx} = '../';
-	PublicInbox::WwwStream->response($ctx, $code);
+	html_oneshot($ctx, $code);
 }
 
 sub ext_urls {
@@ -196,7 +194,7 @@ sub exact {
 					qq(<a\nhref="$u$href/">$u$html/</a>\n)
 				} @$found),
 			$ext_urls, '</pre>');
-	PublicInbox::WwwStream->response($ctx, $code);
+	html_oneshot($ctx, $code);
 }
 
 1;