lei: add some labels support

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

diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 58b6cfc01709f933ec273df8b5790eadda9a9f78..f64b2c62d307887fb451df5d97b6e114c6f13b33 100644 (file)
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -69,11 +69,13 @@ sub xdb_shards_flat { @{$_[0]->{shards_flat} // []} }
 
 sub mitem_kw ($$;$) {
        my ($smsg, $mitem, $flagged) = @_;
-       my $kw = xap_terms('K', $mitem->get_document);
+       my $kw = xap_terms('K', my $doc = $mitem->get_document);
        $kw->{flagged} = 1 if $flagged;
-       # we keep the empty array here to prevent expensive work in
+       # we keep the empty {kw} array here to prevent expensive work in
        # ->xsmsg_vmd, _unbless_smsg will clobber it iff it's empty
        $smsg->{kw} = [ sort keys %$kw ];
+       my $L = xap_terms('L', $doc);
+       $smsg->{L} = [ sort keys %$L ] if scalar(keys %$L);
 }
 
 # like over->get_art
@@ -86,8 +88,10 @@ sub smsg_for {
        my $num = int(($docid - 1) / $nshard) + 1;
        my $ibx = $self->{shard2ibx}->[$shard];
        my $smsg = $ibx->over->get_art($num);
-       return if $smsg->{bytes} == 0;
-       mitem_kw($smsg, $mitem) if $ibx->can('msg_keywords');
+       return if $smsg->{bytes} == 0; # external message
+       if ($ibx->can('msg_keywords')) {
+               mitem_kw($smsg, $mitem);
+       }
        $smsg;
 }
 
@@ -156,6 +160,7 @@ sub query_thread_mset { # for --threads
                $mset = $srch->mset($mo->{qstr}, $mo);
                mset_progress($lei, $desc, $mset->size,
                                $mset->get_matches_estimated);
+               wait_startq($lei); # wait for keyword updates
                my $ids = $srch->mset_to_artnums($mset, $mo);
                my $ctx = { ids => $ids };
                my $i = 0;
@@ -165,11 +170,11 @@ sub query_thread_mset { # for --threads
                                my $smsg = $over->get_art($n) or next;
                                my $mitem = delete $n2item{$smsg->{num}};
                                next if $smsg->{bytes} == 0;
-                               wait_startq($lei); # wait for keyword updates
                                if ($mitem) {
                                        if ($can_kw) {
                                                mitem_kw($smsg, $mitem, $fl);
                                        } elsif ($fl) {
+                                               # call ->xsmsg_vmd, later
                                                $smsg->{lei_q_tt_flagged} = 1;
                                        }
                                }
@@ -196,9 +201,9 @@ sub query_mset { # non-parallel for non-"--threads" users
                $mset = $self->mset($mo->{qstr}, $mo);
                mset_progress($lei, 'xsearch', $mset->size,
                                $mset->size, $mset->get_matches_estimated);
+               wait_startq($lei); # wait for keyword updates
                for my $mitem ($mset->items) {
                        my $smsg = smsg_for($self, $mitem) or next;
-                       wait_startq($lei);
                        $each_smsg->($smsg, $mitem);
                }
        } while (_mset_more($mset, $mo));