some detail changes in the send routines and spot formatting

[spider.git] / cmd / show / dxcc.pl

diff --git a/cmd/show/dxcc.pl b/cmd/show/dxcc.pl
index b95bb7fec9e3b036af820d7f284fbb31d24b40cd..3a2911c583e7bbd9a1904dba450e5cc6428e4269 100644 (file)
--- 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);