diff options
Diffstat (limited to 'lib/PublicInbox/ExtSearch.pm')
-rw-r--r-- | lib/PublicInbox/ExtSearch.pm | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/lib/PublicInbox/ExtSearch.pm b/lib/PublicInbox/ExtSearch.pm index bd301158..d43c23e6 100644 --- a/lib/PublicInbox/ExtSearch.pm +++ b/lib/PublicInbox/ExtSearch.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2020-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> # Read-only external (detached) index for cross inbox search. @@ -33,12 +33,20 @@ sub misc { # same as per-inbox ->over, for now... sub over { my ($self) = @_; - $self->{over} //= PublicInbox::Over->new("$self->{xpfx}/over.sqlite3"); + $self->{over} // eval { + PublicInbox::Inbox::_cleanup_later($self); + my $over = PublicInbox::Over->new("$self->{xpfx}/over.sqlite3"); + $over->dbh; # may die + $self->{over} = $over; + }; } sub git { my ($self) = @_; - $self->{git} //= PublicInbox::Git->new("$self->{topdir}/ALL.git"); + $self->{git} //= do { + PublicInbox::Inbox::_cleanup_later($self); + PublicInbox::Git->new("$self->{topdir}/ALL.git"); + }; } # returns a hashref of { $NEWSGROUP_NAME => $ART_NO } using the `xref3' table @@ -58,7 +66,7 @@ SELECT ibx_id FROM inboxes WHERE eidx_key = ? LIMIT 1 $sth = $dbh->prepare_cached(<<'', undef, 1); SELECT docid FROM xref3 WHERE oidbin = ? AND xnum = ? AND ibx_id = ? LIMIT 1 - $sth->bind_param(1, pack('H*', $xsmsg->{blob}), SQL_BLOB); + $sth->bind_param(1, $xsmsg->oidbin, SQL_BLOB); # NNTP::cmd_over can set {num} to zero according to RFC 3977 8.3.2 $sth->bind_param(2, $xsmsg->{num} || $xsmsg->{-orig_num}); @@ -102,19 +110,25 @@ sub altid_map { {} } sub description { my ($self) = @_; ($self->{description} //= - PublicInbox::Inbox::cat_desc("$self->{topdir}/description")) // + PublicInbox::Git::cat_desc("$self->{topdir}/description")) // '$EXTINDEX_DIR/description missing'; } +sub search { + PublicInbox::Inbox::_cleanup_later($_[0]); + $_[0]; +} + +sub thing_type { 'external index' } + no warnings 'once'; *base_url = \&PublicInbox::Inbox::base_url; *smsg_eml = \&PublicInbox::Inbox::smsg_eml; *smsg_by_mid = \&PublicInbox::Inbox::smsg_by_mid; *msg_by_mid = \&PublicInbox::Inbox::msg_by_mid; *modified = \&PublicInbox::Inbox::modified; -*recent = \&PublicInbox::Inbox::recent; *max_git_epoch = *nntp_usable = *msg_by_path = \&mm; # undef -*isrch = *search = \&PublicInbox::Search::reopen; +*isrch = \&search; 1; |