fixed confusion over DXCluster->get_exact and DXUser->get

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

diff --git a/cmd/show/station.pl b/cmd/show/station.pl
index 2a7034e164804fabab15fd7fd55b8071bc584ee7..4aadd22292e7c1f2536001108263d9bf390f07b2 100644 (file)
--- a/cmd/show/station.pl
+++ b/cmd/show/station.pl
@@ -20,8 +20,15 @@ if (@f == 0) {
                next if !$ref;
                my $lat = $ref->lat;
                my $long = $ref->long;
+               my $sort = $ref->sort || "";
+               my $name = $ref->name || "";
+               my $qth = $ref->qth || "";
+               my $homenode = $ref->homenode || "";
+               my $qra = $ref->qra || "";
                my $latlong = DXBearing::lltos($lat, $long) if $lat && $long;
-               push @out, sprintf "%-9s %s %-12.12s %-27.27s %-9s %s %s", $call, $ref->sort, $ref->name, $ref->qth, $ref->homenode, $latlong, $ref->qra;
+               $latlong = "" unless $latlong;
+               
+               push @out, sprintf "%-9s %s %-12.12s %-27.27s %-9s %s %s", $call, $sort, $name, $qth, $homenode, $latlong, $qra;
        }
 } else {
        foreach $call (@f) {
@@ -52,7 +59,8 @@ if (@f == 0) {
                                $miles = $dx * 0.62133785;
                        }
                        
-                       my $cref = DXCluster->get($call);
+                       my $cref = DXCluster->get_exact($call);
+                       $cref = DXCluster->get($call) unless $cref;
                        my $seek = $cref->mynode->call if $cref;
 
                        if ($seek) {
@@ -64,7 +72,7 @@ if (@f == 0) {
                        push @out, "Last Connect : $last" if $last;
                        push @out, "QTH          : $qth" if $qth;
                        push @out, "Location     : $latlong ($qra)" if $latlong || $qra ;
-                       push @out, sprintf("Heading      : %.0f Deg %.0f Mi. %.0f Km. $from", $bearing, $miles, $dx) if $latlong;
+                       push @out, sprintf("Heading      : %.0f Deg %.0f Mi. %.0f Km.", $bearing, $miles, $dx) if $latlong;
                        push @out, "Home Node    : $homenode" if $homenode;
                } else {
                        push @out, $self->msg('usernf', $call);