From: Dirk Koopman Date: Sun, 29 Jul 2007 19:03:40 +0000 (+0100) Subject: disable use of DBI for sh/dx as default, if active. X-Git-Tag: 1.55~82 X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=a386178f3c1bfcd3d0975d94448245b8c4203988;p=spider.git disable use of DBI for sh/dx as default, if active. --- diff --git a/perl/Spot.pm b/perl/Spot.pm index 76d6e0b6..a2b9eee0 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -21,7 +21,8 @@ use QSL; use strict; -use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth $can_encode); +use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef + $totalspots $hfspots $vhfspots $maxcalllth $can_encode $use_db_for_search); $fp = undef; $statp = undef; @@ -52,6 +53,7 @@ $filterdef = bless ([ ], 'Filter::Cmd'); $totalspots = $hfspots = $vhfspots = 0; +$use_db_for_search = 0; # create a Spot Object sub new @@ -250,7 +252,7 @@ sub search $to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0; - if ($main::dbh) { + if ($main::dbh && $use_db_for_search) { return $main::dbh->spot_search($expr, $dayfrom, $dayto, $to-$from, $dxchan); } diff --git a/perl/Version.pm b/perl/Version.pm index ac7ed80a..72626006 100644 --- a/perl/Version.pm +++ b/perl/Version.pm @@ -11,6 +11,6 @@ use vars qw($version $subversion $build); $version = '1.54'; $subversion = '0'; -$build = '132'; +$build = '133'; 1; diff --git a/perl/cluster.pl b/perl/cluster.pl index 9178a727..d3c90534 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -484,7 +484,7 @@ DXMsg::clean_old(); dbg("reading cron jobs ..."); DXCron->init(); -# read in database descriptors +# read in database desriptors dbg("reading database descriptors ..."); DXDb::load();