lei_search: ignore Resent-Message-ID for indexing

It currently conflicts with the way OverIdx and SearchIdx
index messages, ultimately leading to violating a NOT NULL
constraint on id2num.id in over.sqlite3.

We may allow searching Resent-* fields separately, though I'm
not sure how useful it'll be.

diff --git a/lib/PublicInbox/LeiSearch.pm b/lib/PublicInbox/LeiSearch.pm
index 148aa18510546f603ef9fa6b98790ea8fa4925fe..082176e7dbdda84e17784260baa82df8a333eb8f 100644 (file)
--- a/lib/PublicInbox/LeiSearch.pm
+++ b/lib/PublicInbox/LeiSearch.pm
@@ -8,7 +8,7 @@ use v5.10.1;
 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)
@@ -54,8 +54,7 @@ sub content_key ($) {
        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, 0);

diff --git a/t/lei-import.t b/t/lei-import.t
index 9bb4e1fab97a951a7decb5ec6c926bafcddec605..8635df5a52fbb09e0646f6e0f81cca92de50ae6b 100644 (file)
--- a/t/lei-import.t
+++ b/t/lei-import.t
@@ -83,6 +83,7 @@ is_deeply($res->[0]->{kw}, ['seen'], "`seen' keywords set");
 $eml_str = <<'EOM';
 Subject: draft message with no sender
 References: <y@y>
+Resent-Message-ID: <resent-test@example>
 
 No use for a name
 EOM