X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=1170a3447e5e333d3c1659458ecf8f04d811a33b;hb=4f1c00b0c181d994b13bb9b0ff9ea03ee0cf120c;hp=b65f0f8275a54cbc6d0c9511aa90ecf3843d35ec;hpb=0ce79a125db0acb043fceaa641d8b3a9eae71a41;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index b65f0f82..1170a344 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -32,6 +32,8 @@ my $fromdxcc;
 my $exact;
 my ($doqsl, $doiota, $doqra, $dofilter);
 
+my $usesql = $main::dbh && $Spot::use_db_for_search;
+
 while ($f = shift @list) {		# next field
 	#  print "f: $f list: ", join(',', @list), "\n";
 	if (!$from && !$to) {
@@ -181,7 +183,7 @@ if ($pre) {
 	unless (@ans) {
 		$pre .= '*' unless $pre =~ /[\*\?\[]$/o;
 		$pre = shellregex($pre);
-		if ($main::dbh) {
+		if ($usesql) {
 			$pre =~ s/\.\*/%/g;
 		} else {
 			$pre =~ s/\.\*\$$//;
@@ -257,7 +259,7 @@ if ($spotter) {
 		$expr .= ' && ' if $expr;
 		$spotter .= '*' unless $spotter =~ /[\*\?\[]/o;
 		$spotter = shellregex($spotter);
-		if ($main::dbh) {
+		if ($usesql) {
 			$spotter =~ s/\.\*/%/g;
 		} else {
 			$spotter =~ s/\.\*\$$//;
@@ -331,7 +333,7 @@ if ($state) {
 		push @expr, "\$f12 eq '$_'";
 		push @hint, "m{$_}";
 	}
-	if ($main::dbh) {
+	if ($usesql) {
 		$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
 	} else {
 		$expr .= @expr > 1 ? '(\$f12 && (' . join(' || ', @expr) . '))' : "(\$f12 && $expr[0])";
@@ -347,7 +349,7 @@ if ($bystate) {
 		push @expr, "\$f13 eq '$_'";
 		push @hint, "m{$_}";
 	}
-	if ($main::dbh) {
+	if ($usesql) {
 		$expr .= @expr > 1 ? '(' . join(' || ', @expr) . ')' : "$expr[0]";
 	} else {
 		$expr .= @expr > 1 ? '(\$f13 && (' . join(' || ', @expr) . '))' : "(\$f13 && $expr[0])";
@@ -383,7 +385,7 @@ if ($doqra) {
   
 # now do the search
 
-push @out, $self->spawn_cmd(\&Spot::search, 
+push @out, $self->spawn_cmd("sh/dx $line", \&Spot::search, 
 							args => [$expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef],
 							cb => sub {
 								my ($dxchan, @res) = @_;