www_stream: add trailing slash for help and color links

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

diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 7ec696f4da52d16d26f2552047d1a0dd5f4eebd2..22c8026cd98c678fab5616dc22d0b8b746f1e718 100644 (file)
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -63,7 +63,7 @@ sub locals { @{$_[0]->{locals} // []} }
 
 sub remotes { @{$_[0]->{remotes} // []} }
 
-# called by PublicInbox::Search::xdb
+# called by PublicInbox::Search::xdb (usually via ->mset)
 sub xdb_shards_flat { @{$_[0]->{shards_flat} // []} }
 
 sub mitem_kw ($$;$) {
@@ -92,11 +92,16 @@ sub recent {
        my ($self, $qstr, $opt) = @_;
        $opt //= {};
        $opt->{relevance} //= -2;
-       $self->mset($qstr //= 'bytes:1..', $opt);
+       $self->mset($qstr //= 'z:1..', $opt);
 }
 
 sub over {}
 
+sub overs_all { # for xids_for
+       my ($self) = @_;
+       grep(defined, map { $_->over } locals($self))
+}
+
 sub _mset_more ($$) {
        my ($mset, $mo) = @_;
        my $size = $mset->size;
@@ -148,7 +153,7 @@ sub query_thread_mset { # for --threads
        my $mset;
        my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei, $ibxish);
        my $can_kw = !!$ibxish->can('msg_keywords');
-       my $fl = $lei->{opt}->{threads} > 1;
+       my $fl = $lei->{opt}->{threads} > 1 ? [ 'flagged' ] : undef;
        do {
                $mset = $srch->mset($mo->{qstr}, $mo);
                mset_progress($lei, $desc, $mset->size,
@@ -165,8 +170,8 @@ sub query_thread_mset { # for --threads
                                if ($mitem) {
                                        if ($can_kw) {
                                                mitem_kw($smsg, $mitem, $fl);
-                                       } else {
-                                               $smsg->{kw} = [ 'flagged' ];
+                                       } elsif ($fl) {
+                                               $smsg->{kw} = $fl;
                                        }
                                }
                                $each_smsg->($smsg, $mitem);
@@ -204,7 +209,9 @@ sub query_mset { # non-parallel for non-"--threads" users
 
 sub each_remote_eml { # callback for MboxReader->mboxrd
        my ($eml, $self, $lei, $each_smsg) = @_;
-       $lei->{sto}->ipc_do('set_eml', $eml) if $lei->{sto}; # --import-remote
+       if (my $sto = $self->{import_sto}) {
+               $sto->ipc_do('add_eml_maybe', $eml);
+       }
        my $smsg = bless {}, 'PublicInbox::Smsg';
        $smsg->populate($eml);
        $smsg->parse_references($eml, mids($eml));
@@ -249,6 +256,7 @@ sub query_remote_mboxrd {
        my $curl = PublicInbox::LeiCurl->new($lei, $self->{curl}) or return;
        push @$curl, '-s', '-d', '';
        my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei);
+       $self->{import_sto} = $lei->{sto} if $lei->{opt}->{'import-remote'};
        for my $uri (@$uris) {
                $lei->{-current_url} = $uri->as_string;
                $lei->{-nr_remote_eml} = 0;
@@ -349,7 +357,7 @@ Error closing $lei->{ovv}->{dst}: $!
 
 sub do_post_augment {
        my ($lei) = @_;
-       my $l2m = $lei->{l2m} or die 'BUG: unexpected do_post_augment';
+       my $l2m = $lei->{l2m} or return; # client disconnected
        my $err;
        eval { $l2m->post_augment($lei) };
        $err = $@;
@@ -368,7 +376,7 @@ sub do_post_augment {
 
 sub incr_post_augment { # called whenever an l2m shard finishes augment
        my ($lei) = @_;
-       my $l2m = $lei->{l2m} or die 'BUG: unexpected incr_post_augment';
+       my $l2m = $lei->{l2m} or return; # client disconnected
        return if ++$lei->{nr_post_augment} != $l2m->{-wq_nr_workers};
        do_post_augment($lei);
 }
@@ -416,6 +424,11 @@ sub ipc_atfork_child {
        $self->SUPER::ipc_atfork_child;
 }
 
+sub delete_pkt_op { # OnDestroy callback
+       my $unclosed_after_die = delete($_[0])->{pkt_op_p} or return;
+       close $unclosed_after_die;
+}
+
 sub do_query {
        my ($self, $lei) = @_;
        my $l2m = $lei->{l2m};
@@ -431,6 +444,7 @@ sub do_query {
                'incr_start_query' => [ \&incr_start_query, $self, $l2m ],
        };
        $lei->{auth}->op_merge($ops, $l2m) if $l2m && $lei->{auth};
+       my $od = PublicInbox::OnDestroy->new($$, \&delete_pkt_op, $lei);
        ($lei->{pkt_op_c}, $lei->{pkt_op_p}) = PublicInbox::PktOp->pair($ops);
        $lei->{1}->autoflush(1);
        $lei->start_pager if delete $lei->{need_pager};