Change DXUser->get* to DXUser::get*

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

diff --git a/cmd/show/station.pl b/cmd/show/station.pl
index 2a7034e164804fabab15fd7fd55b8071bc584ee7..55976a6917f709187e7dfd0e15ea37e7b8bcb7fd 100644 (file)
--- a/cmd/show/station.pl
+++ b/cmd/show/station.pl
@@ -11,21 +11,38 @@ my @f = split /\s+/, uc $line;
 my @out;
 my $call;
 my $seek;
+push @f, $self->call unless @f;
 
-if (@f == 0) {
-       return (1, $self->msg('e6')) if ($self->priv < 5); 
-       my @calls = DXUser::get_all_calls();
+if (@f <= 2 && uc $f[0] eq 'ALL') {
+       return (1, $self->msg('e6')) if @f == 1 && $self->priv < 6; 
+       return (1, $self->msg('e6')) if $self->priv < 5 || $f[1] eq '*'; 
+       shift @f;
+       my $exp = shellregex(uc shift @f) if @f; 
+       my @calls;
+       if ($exp) {
+               @calls = grep {m{$exp}} DXUser::get_all_calls();
+    } else {
+               @calls = DXUser::get_all_calls();
+       }
+       
        foreach $call (@calls) {
-               my $ref = DXUser->get_current($call);
+               my $ref = DXUser::get_current($call);
                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) {
-               my $ref = DXUser->get_current($call);
+               my $ref = DXUser::get_current($call);
                if ($ref) {
                        my $name = $ref->name;  
                        my $qth = $ref->qth;
@@ -52,20 +69,20 @@ if (@f == 0) {
                                $miles = $dx * 0.62133785;
                        }
                        
-                       my $cref = DXCluster->get($call);
-                       my $seek = $cref->mynode->call if $cref;
+                       my $cref = Route::get($call);
+                       my $seek = $cref->isa('Route::Node') ? $call : join(',', $cref->parents) if $cref;
 
                        if ($seek) {
-                               push @out, "User         : $call (at $seek)";
+                               push @out, sprintf("%-13s: %s (%s %s)", $self->msg('user'), $call, $self->msg('at'), $seek);
                        } else {
-                               push @out, "User         : $call";
+                               push @out, sprintf("%-13s: %s", $self->msg('user'), $call);
                        }
-                       push @out, "Name         : $name" if $name;
-                       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, "Home Node    : $homenode" if $homenode;
+                       push @out, sprintf("%-13s: %s", $self->msg('name1'), $name) if $name;
+                       push @out, sprintf("%-13s: %s", $self->msg('lastconn'), $last) if $last;
+                       push @out, sprintf("%-13s: %s", 'QTH', $qth) if $qth;
+                       push @out, sprintf("%-13s: %s", $self->msg('location'), "$latlong ($qra)") if $latlong || $qra ;
+                       push @out, sprintf("%-13s: %.0f Deg. %.0f Mi. %.0f Km.", $self->msg('heading'), $bearing, $miles, $dx) if $latlong;
+                       push @out, sprintf("%-13s: %s", $self->msg('homenode2'), $homenode) if $homenode;
                } else {
                        push @out, $self->msg('usernf', $call);
                }