use parent qw(PublicInbox::ExtSearch);
use PublicInbox::Search qw(xap_terms);
use PublicInbox::ContentHash qw(content_digest content_hash);
-use PublicInbox::MID qw(mids mids_in);
+use PublicInbox::MID qw(mids mids_for_index);
# get combined docid from over.num:
# (not generic Xapian, only works with our sharding scheme)
wantarray ? sort(keys(%$kw)) : $kw;
}
+# lookup keywords+labels for external messages
sub xsmsg_vmd {
- my ($self, $smsg) = @_;
+ my ($self, $smsg, $want_label) = @_;
return if $smsg->{kw};
my $xdb = $self->xdb; # set {nshard};
- my %kw;
+ my (%kw, %L, $doc, $x);
$kw{flagged} = 1 if delete($smsg->{lei_q_tt_flagged});
my @num = $self->over->blob_exists($smsg->{blob});
for my $num (@num) { # there should only be one...
- my $kw = xap_terms('K', $xdb, num2docid($self, $num));
- %kw = (%kw, %$kw);
+ $doc = $xdb->get_document(num2docid($self, $num));
+ $x = xap_terms('K', $doc);
+ %kw = (%kw, %$x);
+ if ($want_label) { # JSON/JMAP only
+ $x = xap_terms('L', $doc);
+ %L = (%L, %$x);
+ }
}
$smsg->{kw} = [ sort keys %kw ] if scalar(keys(%kw));
+ $smsg->{L} = [ sort keys %L ] if scalar(keys(%L));
}
# when a message has no Message-IDs at all, this is needed for
my ($eml) = @_;
my $dig = content_digest($eml);
my $chash = $dig->clone->digest;
- my $mids = mids_in($eml,
- qw(Message-ID X-Alt-Message-ID Resent-Message-ID));
+ my $mids = mids_for_index($eml);
unless (@$mids) {
$eml->{-lei_fake_mid} = $mids->[0] =
- PublicInbox::Import::digest2mid($dig, $eml);
+ PublicInbox::Import::digest2mid($dig, $eml, 0);
}
($chash, $mids);
}
# returns true if $eml is indexed by lei/store and keywords don't match
sub kw_changed {
- my ($self, $eml, $new_kw_sorted) = @_;
- my $xoids = xoids_for($self, $eml, 1) // return;
- my ($num) = values %$xoids;
- my @cur_kw = msg_keywords($self, $num);
- join("\0", @$new_kw_sorted) eq join("\0", @cur_kw) ? 0 : 1;
+ my ($self, $eml, $new_kw_sorted, $docids) = @_;
+ my $xoids = xoids_for($self, $eml) // return;
+ $docids //= [];
+ @$docids = sort { $a <=> $b } values %$xoids;
+ my $cur_kw = msg_keywords($self, $docids->[0]);
+
+ # RFC 5550 sec 5.9 on the $Forwarded keyword states:
+ # "Once set, the flag SHOULD NOT be cleared"
+ if (exists($cur_kw->{forwarded}) &&
+ !grep(/\Aforwarded\z/, @$new_kw_sorted)) {
+ delete $cur_kw->{forwarded};
+ }
+ $cur_kw = join("\0", sort keys %$cur_kw);
+ join("\0", @$new_kw_sorted) eq $cur_kw ? 0 : 1;
+}
+
+sub all_terms {
+ my ($self, $pfx) = @_;
+ my $xdb = $self->xdb;
+ my $cur = $xdb->allterms_begin($pfx);
+ my $end = $xdb->allterms_end($pfx);
+ my %ret;
+ for (; $cur != $end; $cur++) {
+ my $tn = $cur->get_termname;
+ index($tn, $pfx) == 0 and
+ $ret{substr($tn, length($pfx))} = undef;
+ }
+ wantarray ? (sort keys %ret) : \%ret;
+}
+
+sub qparse_new {
+ my ($self) = @_;
+ my $qp = $self->SUPER::qparse_new; # PublicInbox::Search
+ $qp->add_boolean_prefix('kw', 'K');
+ $qp->add_boolean_prefix('L', 'L');
+ $qp
}
1;