#
# Used by the web interface to link to messages outside of the our
@@ -8,8 +8,9 @@
package PublicInbox::ExtMsg;
use strict;
use warnings;
-use PublicInbox::Hval qw(ascii_html prurl);
-use PublicInbox::WwwStream;
+use PublicInbox::Hval qw(ascii_html prurl mid_href);
+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,15 +65,16 @@ 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);
}
}
sub ext_msg_i {
- my ($other, $arg) = @_;
- my ($cur, $mid, $ibxs, $found) = @$arg;
+ my ($other, $cur, $mid, $ibxs, $found) = @_;
return if $other->{name} eq $cur->{name} || !$other->base_url;
@@ -101,17 +100,16 @@ sub ext_msg {
eval { require PublicInbox::Msgmap };
my $ibxs = [];
my $found = [];
- my $arg = [ $cur, $mid, $ibxs, $found ];
- $ctx->{www}->{pi_config}->each_inbox(\&ext_msg_i, $arg);
+ $ctx->{www}->{pi_config}->each_inbox(\&ext_msg_i,
+ $cur, $mid, $ibxs, $found);
return exact($ctx, $found, $mid) if @$found;
# 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 +118,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;
@@ -129,9 +126,8 @@ sub ext_msg {
}
my $code = 404;
- my $h = PublicInbox::Hval->new_msgid($mid);
- my $href = $h->{href};
- my $html = $h->as_html;
+ my $href = mid_href($mid);
+ my $html = ascii_html($mid);
my $title = "<$html> not found";
my $s = "Message-ID <$html>\nnot found\n";
if ($n_partial) {
@@ -145,10 +141,9 @@ sub ext_msg {
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->{href};
- my $t = $p->as_html;
- $s .= qq{$u$t/\n};
+ my $href = mid_href($m);
+ my $html = ascii_html($m);
+ $s .= qq{$u$html/\n};
}
}
}
@@ -160,7 +155,7 @@ sub ext_msg {
$ctx->{-html_tip} = $s .= '
';
$ctx->{-title_html} = $title;
$ctx->{-upfx} = '../';
- PublicInbox::WwwStream->response($ctx, $code);
+ html_oneshot($ctx, $code);
}
sub ext_urls {
@@ -183,9 +178,8 @@ sub ext_urls {
sub exact {
my ($ctx, $found, $mid) = @_;
- my $h = PublicInbox::Hval->new_msgid($mid);
- my $href = $h->{href};
- my $html = $h->as_html;
+ my $href = mid_href($mid);
+ my $html = ascii_html($mid);
my $title = "<$html> found in ";
my $end = @$found == 1 ? 'another inbox' : 'other inboxes';
$ctx->{-title_html} = $title . $end;
@@ -199,7 +193,7 @@ sub exact {
qq($u$html/\n)
} @$found),
$ext_urls, '');
- PublicInbox::WwwStream->response($ctx, $code);
+ html_oneshot($ctx, $code);
}
1;