X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdxcc.pl;h=3a2911c583e7bbd9a1904dba450e5cc6428e4269;hb=b5b58db69484da5554b4f7e10b813d13e8cf16cb;hp=b95bb7fec9e3b036af820d7f284fbb31d24b40cd;hpb=e5b0e3dee551a224de284a5ba550098256fcb268;p=spider.git diff --git a/cmd/show/dxcc.pl b/cmd/show/dxcc.pl index b95bb7fe..3a2911c5 100644 --- a/cmd/show/dxcc.pl +++ b/cmd/show/dxcc.pl @@ -75,7 +75,7 @@ if (@ans) { # we have a valid prefix! $expr .= " && ("; my $i; for ($i; $i < @freq; $i += 2) { - $expr .= "(\$f0 >= $freq[0] && \$f0 <= $freq[1]) ||"; + $expr .= "(\$f0 >= $freq[$i] && \$f0 <= $freq[$i+1]) ||"; } chop $expr; chop $expr; @@ -90,12 +90,10 @@ if (@ans) { # we have a valid prefix! my @dx; foreach $ref (@res) { @dx = @$ref; - my $t = ztime($dx[2]); - my $d = cldate($dx[2]); - push @out, sprintf "%9s %-12s %s %s %-28s <%s>", $dx[0], $dx[1], $d, $t, $dx[3], $dx[4]; + push @out, Spot::formatl(@dx); } } else { - @out = DXM::msg('e4'); + @out = $self->msg('e4'); } return (1, @out);