X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;fp=cmd%2Fshow%2Fdx.pl;h=1e14399fa794434beca2992f3d07e87fb43f6bc2;hb=f2c90f82509ae2be33216ebaed3bc9f8ea3f5f80;hp=08f947eac68e8d53fba3949e43e52af9dcd4027b;hpb=5fc4f15ca36b6926fac4a8b33b3944cc1f7cef49;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 08f947ea..1e14399f 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -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) = @_; 
@@ -445,20 +461,7 @@ push @out, $self->spawn_cmd("sh/dx $line", \&Spot::search,
 								push @out, $self->msg('e3', "sh/dx", "'$line'") unless @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);