Stop showing `docid' since it's not useful with shards.
`bytes' and `lines' are probably noise, but maybe could be
visible in some "fuller" view.
v2: t/lei_xsearch: fix warnings from {docid} removal
sub _unbless_smsg {
my ($smsg, $mitem) = @_;
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;
$smsg->{rt} = _iso8601(delete $smsg->{ts}); # JMAP receivedAt
$smsg->{dt} = _iso8601(delete $smsg->{ds}); # JMAP UTCDate
$smsg->{pct} = get_pct($mitem) if $mitem;
$smsg->{substr($f, 0, 1)} = pairs($v);
}
$smsg->{'s'} = delete $smsg->{subject};
$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
my ($smsg, $mitem, $flagged) = @_;
my $kw = xap_terms('K', $mitem->get_document);
$kw->{flagged} = 1 if $flagged;
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 ];
}
$smsg->{kw} = [ sort keys %$kw ];
}
my $smsg = $ibx->over->get_art($num);
return if $smsg->{bytes} == 0;
mitem_kw($smsg, $mitem) if $ibx->can('msg_keywords');
my $smsg = $ibx->over->get_art($num);
return if $smsg->{bytes} == 0;
mitem_kw($smsg, $mitem) if $ibx->can('msg_keywords');
- $smsg->{docid} = $docid;
lei(qw(q m:v@y));
$res = json_utf8->decode($lei_out);
is($res->[1], undef, 'only one result');
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*"
});
# see t/lei_to_mail.t for "import -F mbox*"
});
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
use v5.10.1;
# 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));
use PublicInbox::TestCommon;
use PublicInbox::Eml;
require_mods(qw(DBD::SQLite Search::Xapian));
$mset = $lxs->recent(undef, { limit => 1 });
is($mset->size, 1, 'one result');
$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');
my @ibxish = $lxs->locals;
is(scalar(@ibxish), scalar(@ibx) + 1, 'got locals back');