diff options
| -rw-r--r-- | lib/PublicInbox/LeiExportKw.pm | 7 | ||||
| -rw-r--r-- | lib/PublicInbox/LeiSearch.pm | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lib/PublicInbox/LeiExportKw.pm b/lib/PublicInbox/LeiExportKw.pm index 671a84df..42a5ff22 100644 --- a/lib/PublicInbox/LeiExportKw.pm +++ b/lib/PublicInbox/LeiExportKw.pm @@ -10,8 +10,7 @@ use Errno qw(EEXIST ENOENT); sub export_kw_md { # LeiMailSync->each_src callback my ($oidbin, $id, $self, $mdir) = @_; - my $oidhex = unpack('H*', $oidbin); - my $sto_kw = $self->{lse}->oid_keywords($oidhex) or return; + my $sto_kw = $self->{lse}->oidbin_keywords($oidbin) or return; my $bn = $$id; my ($md_kw, $unknown, @try); if ($bn =~ s/:2,([a-zA-Z]*)\z//) { @@ -57,13 +56,13 @@ sub export_kw_md { # LeiMailSync->each_src callback # both tries failed my $e = $!; my $orig = '['.join('|', @fail).']'; + my $oidhex = unpack('H*', $oidbin); $lei->child_error(1, "link($orig, $dst) ($oidhex): $e"); } sub export_kw_imap { # LeiMailSync->each_src callback my ($oidbin, $id, $self, $mic) = @_; - my $oidhex = unpack('H*', $oidbin); - my $sto_kw = $self->{lse}->oid_keywords($oidhex) or return; + my $sto_kw = $self->{lse}->oidbin_keywords($oidbin) or return; $self->{imap_mod_kw}->($self->{nwr}, $mic, $id, [ keys %$sto_kw ]); } diff --git a/lib/PublicInbox/LeiSearch.pm b/lib/PublicInbox/LeiSearch.pm index 37bfc65e..79b2fd7d 100644 --- a/lib/PublicInbox/LeiSearch.pm +++ b/lib/PublicInbox/LeiSearch.pm @@ -42,9 +42,9 @@ sub _oid_kw { # retry_reopen callback } # returns undef if blob is unknown -sub oid_keywords { - my ($self, $oidhex) = @_; - my @num = $self->over->blob_exists($oidhex) or return; +sub oidbin_keywords { + my ($self, $oidbin) = @_; + my @num = $self->over->oidbin_exists($oidbin) or return; $self->retry_reopen(\&_oid_kw, \@num); } |