diff options
| -rw-r--r-- | lib/PublicInbox/LeiOverview.pm | 8 | ||||
| -rw-r--r-- | lib/PublicInbox/LeiXSearch.pm | 3 | ||||
| -rw-r--r-- | t/lei-import.t | 2 | ||||
| -rw-r--r-- | t/lei_xsearch.t | 5 |
4 files changed, 10 insertions, 8 deletions
diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm index 521bca50..1ce2a098 100644 --- a/lib/PublicInbox/LeiOverview.pm +++ b/lib/PublicInbox/LeiOverview.pm @@ -136,7 +136,10 @@ sub ovv_end { sub _unbless_smsg { my ($smsg, $mitem) = @_; - delete @$smsg{qw(lines bytes num tid)}; + # TODO: make configurable + # num/tid are nonsensical with multi-inbox search, + # lines/bytes are not generally useful + delete @$smsg{qw(num tid lines bytes)}; $smsg->{rt} = _iso8601(delete $smsg->{ts}); # JMAP receivedAt $smsg->{dt} = _iso8601(delete $smsg->{ds}); # JMAP UTCDate $smsg->{pct} = get_pct($mitem) if $mitem; @@ -151,7 +154,8 @@ sub _unbless_smsg { $smsg->{substr($f, 0, 1)} = pairs($v); } $smsg->{'s'} = delete $smsg->{subject}; - scalar { %$smsg }; # unbless + my $kw = delete($smsg->{kw}); + scalar { %$smsg, ($kw && scalar(@$kw) ? (kw => $kw) : ()) }; # unbless } sub ovv_atexit_child { diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index 57717b87..17171a7f 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -70,6 +70,8 @@ sub mitem_kw ($$;$) { my ($smsg, $mitem, $flagged) = @_; my $kw = xap_terms('K', $mitem->get_document); $kw->{flagged} = 1 if $flagged; + # we keep the empty array here to prevent expensive work in + # ->xsmsg_vmd, _unbless_smsg will clobber it iff it's empty $smsg->{kw} = [ sort keys %$kw ]; } @@ -85,7 +87,6 @@ sub smsg_for { my $smsg = $ibx->over->get_art($num); return if $smsg->{bytes} == 0; mitem_kw($smsg, $mitem) if $ibx->can('msg_keywords'); - $smsg->{docid} = $docid; $smsg; } diff --git a/t/lei-import.t b/t/lei-import.t index edb0cd20..e0b517f4 100644 --- a/t/lei-import.t +++ b/t/lei-import.t @@ -48,7 +48,7 @@ lei_ok([qw(import --no-kw -F eml -)], undef, $opt, lei(qw(q m:v@y)); $res = json_utf8->decode($lei_out); is($res->[1], undef, 'only one result'); -is_deeply($res->[0]->{kw}, [], 'no keywords set'); +is($res->[0]->{kw}, undef, 'no keywords set'); # see t/lei_to_mail.t for "import -F mbox*" }); diff --git a/t/lei_xsearch.t b/t/lei_xsearch.t index e56b2820..3eb44233 100644 --- a/t/lei_xsearch.t +++ b/t/lei_xsearch.t @@ -3,7 +3,7 @@ # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> use strict; use v5.10.1; -use List::Util qw(shuffle max); +use List::Util qw(shuffle); use PublicInbox::TestCommon; use PublicInbox::Eml; require_mods(qw(DBD::SQLite Search::Xapian)); @@ -62,9 +62,6 @@ is(scalar(@msgs), $nr, 'smsgs retrieved for all'); $mset = $lxs->recent(undef, { limit => 1 }); is($mset->size, 1, 'one result'); -my $max = max(map { $_->{docid} } @msgs); -is($lxs->smsg_for(($mset->items)[0])->{docid}, $max, - 'got highest docid'); my @ibxish = $lxs->locals; is(scalar(@ibxish), scalar(@ibx) + 1, 'got locals back'); |