From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sun, 9 Jan 2011 15:20:25 +0000 (+0000)
Subject: SearchModule config to select engine
X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=commitdiff_plain;h=4f30cdbfa005d01e0aca721c4a319dbdbdc47158;ds=sidebyside

SearchModule config to select engine
---

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