disable use of DBI for sh/dx as default, if active.

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 76d6e0b63191036f733d168e08636447e684f0ea..a2b9eee04efe5d9856f4e9d104721350818e495a 100644 (file)
--- 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 ac7ed80a4c4367270cc96079e5069d0759ef9f57..726260065e08cc37644810c870f9822af1331fef 100644 (file)
--- 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 9178a7277c54893055a4c3f95c87096994c1081c..d3c905340ee7cf7d2875712c0bd467695b9739ec 100755 (executable)
--- 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();