From 4f30cdbfa005d01e0aca721c4a319dbdbdc47158 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Sun, 9 Jan 2011 15:20:25 +0000 Subject: [PATCH] SearchModule config to select engine --- lib/BackupPC/Search.pm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/BackupPC/Search.pm b/lib/BackupPC/Search.pm index 41f4e76..67e0f98 100644 --- a/lib/BackupPC/Search.pm +++ b/lib/BackupPC/Search.pm @@ -18,12 +18,12 @@ my $pager_pages = 10; my $dsn = $Conf{SearchDSN}; my $db_user = $Conf{SearchUser} || ''; -our $search_module; - sub search_module { - $search_module = "BackupPC::Search::Estraier"; - $search_module = "BackupPC::Search::KinoSearch" if $ENV{KINO}; + my $bpc = BackupPC::Lib->new || die; + my %Conf = $bpc->Conf(); + + my $search_module = $Conf{SearchModule} || die "search is disabled"; eval "use $search_module"; if ( $@ ) { warn "ERROR: $search_module: $!"; @@ -31,9 +31,6 @@ sub search_module { warn "# using $search_module for full-text search"; } - my $bpc = BackupPC::Lib->new || die; - my %Conf = $bpc->Conf(); - return $search_module->new( %Conf ); } -- 2.20.1