1 files changed, 8 insertions, 11 deletions

diff --git a/lib/PublicInbox/LeiImportKw.pm b/lib/PublicInbox/LeiImportKw.pm
index c35c5c26..765e23cd 100644
--- a/lib/PublicInbox/LeiImportKw.pm
+++ b/lib/PublicInbox/LeiImportKw.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # WQ worker for dealing with LeiImport IMAP flags on already-imported messages
@@ -7,6 +7,7 @@ package PublicInbox::LeiImportKw;
 use strict;
 use v5.10.1;
 use parent qw(PublicInbox::IPC);
+use PublicInbox::Compat qw(uniqstr);
 
 sub new {
         my ($cls, $lei) = @_;
@@ -28,18 +29,17 @@ sub ipc_atfork_child {
         $self->{verbose} = $lei->{opt}->{verbose};
         $self->{lse} = $self->{sto}->search;
         $self->{over} = $self->{lse}->over;
-        $self->{-lms_ro} = $net->{-lms_ro} || die 'BUG: net->{-lms_ro} FALSE';
+        $self->{-lms_rw} = $net->{-lms_rw} || die 'BUG: net->{-lms_rw} FALSE';
         $self->SUPER::ipc_atfork_child;
 }
 
 sub ck_update_kw { # via wq_io_do
         my ($self, $url, $uid, $kw) = @_;
-        my @oidbin = $self->{-lms_ro}->num_oidbin($url, $uid);
-        my $uid_url = "$url/;UID=$uid";
-        @oidbin > 1 and $self->{lei}->err("W: $uid_url not unique:\n",
+        my @oidbin = $self->{-lms_rw}->num_oidbin($url, $uid);
+        my $uid_url = index($url, 'mh:') == 0 ? $url.$uid : "$url/;UID=$uid";
+        @oidbin > 1 and warn("W: $uid_url not unique:\n",
                                 map { "\t".unpack('H*', $_)."\n" } @oidbin);
-        my %seen;
-        my @docids = sort { $a <=> $b } grep { !$seen{$_}++ }
+        my @docids = sort { $a <=> $b } uniqstr
                 map { $self->{over}->oidbin_exists($_) } @oidbin;
         $self->{lse}->kw_changed(undef, $kw, \@docids) or return;
         $self->{verbose} and $self->{lei}->qerr("# $uid_url => @$kw\n");
@@ -47,10 +47,7 @@ sub ck_update_kw { # via wq_io_do
 }
 
 sub _lei_wq_eof { # EOF callback for main lei daemon
-        my ($lei) = @_;
-        my $ikw = delete $lei->{ikw} or return $lei->fail;
-        $lei->sto_done_request($ikw->{lei_sock});
-        $ikw->wq_wait_old($lei->can('wq_done_wait'), $lei);
+        $_[0]->wq_eof('ikw');
 }
 
 1;