Merge remote-tracking branch 'origin/master' into lorelei

[public-inbox.git] / lib / PublicInbox / ExtSearch.pm

diff --git a/lib/PublicInbox/ExtSearch.pm b/lib/PublicInbox/ExtSearch.pm
index 80455d8d3a99b965d893bd02ffe63d5559da1461..2bcdece61e3a4e95090fcbb1aca81f69dedbd975 100644 (file)
--- a/lib/PublicInbox/ExtSearch.pm
+++ b/lib/PublicInbox/ExtSearch.pm
@@ -9,7 +9,6 @@ use strict;
 use v5.10.1;
 use PublicInbox::Over;
 use PublicInbox::Inbox;
-use File::Spec ();
 use PublicInbox::MiscSearch;
 use DBI qw(:sql_types); # SQL_BLOB
 
@@ -17,13 +16,12 @@ use DBI qw(:sql_types); # SQL_BLOB
 use parent qw(PublicInbox::Search);
 
 sub new {
-       my (undef, $topdir) = @_;
-       $topdir = File::Spec->canonpath($topdir);
+       my ($class, $topdir) = @_;
        bless {
                topdir => $topdir,
                # xpfx => 'ei15'
                xpfx => "$topdir/ei".PublicInbox::Search::SCHEMA_VERSION
-       }, __PACKAGE__;
+       }, $class;
 }
 
 sub misc {
@@ -31,14 +29,6 @@ sub misc {
        $self->{misc} //= PublicInbox::MiscSearch->new("$self->{xpfx}/misc");
 }
 
-sub search { $_[0] } # self
-
-# overrides PublicInbox::Search::_xdb
-sub _xdb {
-       my ($self) = @_;
-       $self->xdb_sharded;
-}
-
 # same as per-inbox ->over, for now...
 sub over {
        my ($self) = @_;
@@ -128,5 +118,6 @@ no warnings 'once';
 *recent = \&PublicInbox::Inbox::recent;
 
 *max_git_epoch = *nntp_usable = *msg_by_path = \&mm; # undef
+*isrch = *search = \&PublicInbox::Search::reopen;
 
 1;