X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=1e14399fa794434beca2992f3d07e87fb43f6bc2;hb=9c8ae21bbf6c6c51c04f62b18b613bbf42a375ca;hp=371a3983a0ef2d6b74d33f47dedabf7cb03a5966;hpb=043ec29d2c3f7d807f02660417696f0e93e20880;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 371a3983..1e14399f 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -38,7 +38,7 @@ my ($doqsl, $doiota, $doqra, $dofilter);
 my $usesql = $main::dbh && $Spot::use_db_for_search;
 
 while ($f = shift @list) {		# next field
-	dbg "arg: $f list: " . join(',', @list) if isdbg('shdx');
+	dbg "arg: $f list: " . join(',', @list) if isdbg('sh/dx');
 	if (!$from && !$to) {
 		($from, $to) = $f =~ m|^(\d+)[-/](\d+)$|; # is it a from -> to count?
 		next if $from && $to > $from;
@@ -60,19 +60,19 @@ while ($f = shift @list) {		# next field
 		next;
 	}
 	if (lc $f eq 'on' && $list[0]) { # is it freq range?
-		dbg "freq $list[0]" if isdbg('shdx');
+		dbg "freq $list[0]" if isdbg('sh/dx');
 		if (my ($from, $to) = $list[0] =~ m|^(\d+)(?:\.\d+)?(?:[-/](\d+)(?:\.\d+)?)?$|) {
 			$to = $from unless defined $to;
-			dbg "freq '$from' '$to'" if isdbg('shdx');
+			dbg "freq '$from' '$to'" if isdbg('sh/dx');
 			push @freq, $from, $to;
 			shift @list;
 			next;
 		} else {
 			my @r = split '/', lc $list[0];
-			dbg "r0: $r[0] r1: $r[1]" if isdbg('shdx');
+			dbg "r0: $r[0] r1: $r[1]" if isdbg('sh/dx');
 			my @fr = Bands::get_freq($r[0], $r[1]);
 			if (@fr) {			# yup, get rid of extranous param
-				dbg "freq: " . join(',', @fr) if isdbg('shdx');
+				dbg "freq: " . join(',', @fr) if isdbg('sh/dx');
 				push @freq, @fr;    # add these to the list
 				shift @list;
 				next;
@@ -81,22 +81,22 @@ while ($f = shift @list) {		# next field
 	}
 	if (lc $f eq 'day' && $list[0]) {
 		($fromday, $today) = split m|[-/]|, shift(@list);
-		dbg "got day $fromday/$today" if isdbg('shdx');
+		dbg "got day $fromday/$today" if isdbg('sh/dx');
 		next;
 	}
 	if (lc $f eq 'info' && $list[0]) {
 		$info = shift @list;
-		dbg "got info $info" if isdbg('shdx');
+		dbg "got info $info" if isdbg('sh/dx');
 		next;
 	}
 	if (lc $f eq 'origin' && $list[0]) {
 		$origin = uc shift @list;
-		dbg "got origin $origin" if isdbg('shdx');
+		dbg "got origin $origin" if isdbg('sh/dx');
 		next;
 	}
 	if (lc $f eq 'ip' && $list[0]) {
 		$ip = shift @list;
-		dbg "got ip $ip" if isdbg('shdx');
+		dbg "got ip $ip" if isdbg('sh/dx');
 		next;
 	}
 
@@ -106,7 +106,7 @@ while ($f = shift @list) {		# next field
 			$fromdxcc = 1;
 			shift @list;
 		}
-		dbg "got spotter $spotter fromdxcc $fromdxcc" if isdbg('shdx');
+		dbg "got spotter $spotter fromdxcc $fromdxcc" if isdbg('sh/dx');
 		next;
 	}
 	if (lc $f =~ /^filt/) {
@@ -424,7 +424,23 @@ dbg "expr: $expr from: $from to: $to fromday: $fromday today: $today" if isdbg('
   
 # now do the search
 
-push @out, $self->spawn_cmd("sh/dx $line", \&Spot::search, 
+if ($self->{_nospawn}) {
+	my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef);
+	my $ref;
+	my @dx;
+	foreach $ref (@res) {
+		if ($self && $self->ve7cc) {
+			push @out, VE7CC::dx_spot($self, @$ref);
+		} else {
+			if ($self && $real) {
+				push @out, DXCommandmode::format_dx_spot($self, @$ref);
+			} else {
+				push @out, Spot::formatl(@$ref);
+			}
+		}
+	}
+} else {
+	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) = @_; 
@@ -443,22 +459,9 @@ push @out, $self->spawn_cmd("sh/dx $line", \&Spot::search,
 									}
 								}
 								push @out, $self->msg('e3', "sh/dx", "'$line'") unless @out;
-								$dxchan->send(@out);
+								return @out;
 							});
+}
 
-#my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef);
-#my $ref;
-#my @dx;
-#foreach $ref (@res) {
-#	if ($self && $self->ve7cc) {
-#		push @out, VE7CC::dx_spot($self, @$ref);
-#	} else {
-#		if ($self && $real) {
-#			push @out, DXCommandmode::format_dx_spot($self, @$ref);
-#		} else {
-#			push @out, Spot::formatl(@$ref);
-#		}
-#	}
-#}
 
 return (1, @out);