Merge tag 'v1.6.1' into eidx

[public-inbox.git] / lib / PublicInbox / ExtMsg.pm

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 43acfb5377a0c1c537b421d4e85d17623ab25b1c..4df885ab737c81a4c3f393e38965e6bd108f13da 100644 (file)
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -33,7 +33,7 @@ sub search_partial ($$) {
        my ($ibx, $mid) = @_;
        return if length($mid) < $MIN_PARTIAL_LEN;
        my $srch = $ibx->search or return; # NOT ->isrch, we already try ->ALL
-       my $opt = { limit => PARTIAL_MAX, mset => 2 };
+       my $opt = { limit => PARTIAL_MAX, relevance => -1 };
        my @try = ("m:$mid*");
        my $chop = $mid;
        if ($chop =~ s/(\W+)(\w*)\z//) {
@@ -105,9 +105,10 @@ sub ext_msg_step {
 
 sub ext_msg_ALL ($) {
        my ($ctx) = @_;
-       my $ALL = $ctx->{www}->{pi_config}->ALL or return;
-       my $by_eidx_key = $ctx->{www}->{pi_config}->{-by_eidx_key};
-       my $cur_key = $ctx->{ibx}->eidx_key;
+       my $ALL = $ctx->{www}->{pi_cfg}->ALL or return;
+       my $by_eidx_key = $ctx->{www}->{pi_cfg}->{-by_eidx_key};
+       my $cur_key = eval { $ctx->{ibx}->eidx_key } //
+                       return partial_response($ctx); # $cur->{ibx} == $ALL
        my %seen = ($cur_key => 1);
        my ($id, $prev);
        while (my $x = $ALL->over->next_by_mid($ctx->{mid}, \$id, \$prev)) {
@@ -139,11 +140,11 @@ sub ext_msg {
                if ($ctx->{env}->{'pi-httpd.async'}) {
                        require PublicInbox::ConfigIter;
                        my $iter = PublicInbox::ConfigIter->new(
-                                               $ctx->{www}->{pi_config},
+                                               $ctx->{www}->{pi_cfg},
                                                \&ext_msg_step, $ctx);
                        $iter->event_step;
                } else {
-                       $ctx->{www}->{pi_config}->each_inbox(\&ext_msg_i, $ctx);
+                       $ctx->{www}->{pi_cfg}->each_inbox(\&ext_msg_i, $ctx);
                        finalize_exact($ctx);
                }
        };