sub PARTIAL_MAX () { 100 }
-sub mids_from_mset { # Search::retry_reopen callback
- [ map { PublicInbox::Smsg::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;
# 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;
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 ];
# 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;