search: make xap_terms easier-to-use and use it more

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

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index f553eda69b42d3ec8dfe23142812afe15d4f4104..65764cc81a81b167a7e5a59561d4e1084401531e 100644 (file)
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -435,8 +435,9 @@ sub add_xapian ($$$$) {
        if (my $old = $merge_vmd ? _get_doc($self, $smsg->{num}) : undef) {
                my @x = @VMD_MAP;
                while (my ($field, $pfx) = splice(@x, 0, 2)) {
-                       my $vals = xap_terms($pfx, $old);
-                       $doc->add_boolean_term($pfx.$_) for keys %$vals;
+                       for my $term (xap_terms($pfx, $old)) {
+                               $doc->add_boolean_term($pfx.$term);
+                       }
                }
        }
        $self->{xdb}->replace_document($smsg->{num}, $doc);