X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=b65f0f8275a54cbc6d0c9511aa90ecf3843d35ec;hb=a76624e4742348ed0f39c7c3f732cdec8462da9e;hp=f2629bfff0e225ef7249e358a17b166f46d38708;hpb=ed96190995aa228ca30398b06c3cc0af1a59bf54;p=spider.git diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl index f2629bff..b65f0f82 100644 --- a/cmd/show/dx.pl +++ b/cmd/show/dx.pl @@ -4,12 +4,13 @@ # # + my ($self, $line) = @_; my @list = split /\s+/, $line; # split the line up my @out; my $f; -my $call; +my $call = $self->call; my ($from, $to); my ($fromday, $today); my @freq; @@ -381,19 +382,41 @@ if ($doqra) { #print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n"; # now do the search -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); - } - } -} + +push @out, $self->spawn_cmd(\&Spot::search, + args => [$expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef], + cb => sub { + my ($dxchan, @res) = @_; + my $ref; + my @out; + + foreach $ref (@res) { + if ($self->ve7cc) { + push @out, VE7CC::dx_spot($self, @$ref); + } else { + if ($real) { + push @out, DXCommandmode::format_dx_spot($self, @$ref); + } else { + push @out, Spot::formatl(@$ref); + } + } + } + $dxchan->send(@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);