projects
/
BackupPC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d060aa5
)
SearchModule config to select engine
author
Dobrica Pavlinusic
<dpavlin@rot13.org>
Sun, 9 Jan 2011 15:20:25 +0000
(15:20 +0000)
committer
Dobrica Pavlinusic
<dpavlin@rot13.org>
Sun, 9 Jan 2011 15:20:25 +0000
(15:20 +0000)
lib/BackupPC/Search.pm
patch
|
blob
|
history
diff --git
a/lib/BackupPC/Search.pm
b/lib/BackupPC/Search.pm
index
41f4e76
..
67e0f98
100644
(file)
--- 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} || '';
my $dsn = $Conf{SearchDSN};
my $db_user = $Conf{SearchUser} || '';
-our $search_module;
-
sub 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: $!";
eval "use $search_module";
if ( $@ ) {
warn "ERROR: $search_module: $!";
@@
-31,9
+31,6
@@
sub search_module {
warn "# using $search_module for full-text search";
}
warn "# using $search_module for full-text search";
}
- my $bpc = BackupPC::Lib->new || die;
- my %Conf = $bpc->Conf();
-
return $search_module->new( %Conf );
}
return $search_module->new( %Conf );
}