X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FSearch.pm;h=67e0f9897ac54539b455c8e4fd05ab633f4223dd;hp=41f4e764f75b81169e3d7b2d33181e3e4f00d5f1;hb=0a2303cdbfbc9ab4b83edf46635a73fb7323b2f2;hpb=d060aa5c2807ff541ac5c83eacfed101ed82c391

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 );
 }