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

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

diff --git a/cmd/show/users.pl b/cmd/show/users.pl
index 2e69786b4376f2c4fa46dd0db350071ce8787269..1d665eba5a91858dbdfa89f33bb42879e776753b 100644 (file)
--- a/cmd/show/users.pl
+++ b/cmd/show/users.pl
@@ -1,15 +1,54 @@
 #
-# show either the current user or a nominated set
+# show the users on this cluster from the routing tables
+#
+# Copyright (c) 1998 Dirk Koopman G1TLH
+#
 #
-# $Id$
 #
 
 my ($self, $line) = @_;
-my @list = DXChannel->get_all();
-my $chan;
+my @list = map { uc } split /\s+/, $line; # list of callsigns of nodes
 my @out;
-foreach $chan (@list) {
-  push @out, "Callsign: $chan->{call}";
+
+if (@list) {
+       foreach my $call (sort @list) {
+               my $uref = DXUser::get_current($call);
+               if ($uref) {
+                       my $name = $uref->name || '?';
+                       my $qth = $uref->qth || '?';
+                       my $qra = $uref->qra || '';
+                       my $route = '';
+                       if (my $rref = Route::get($call)) {
+                               $route = '(at ' . join(',', $rref->parents) . ')';
+                       }
+                       push @out, "$call $route $name $qth $qra",
+               } else {
+                       push @out, $self->msg('usernf', $call);
+               }
+       }
+} else {
+       my $node = $main::routeroot;
+       push @out, join(' ', $self->msg('userconn'), $main::mycall);
+       my $call;
+       my @l;
+       my @val = sort $node->users;
+       foreach $call (@val) {
+               if (@l >= 5) {
+                       push @out, sprintf "%-12s %-12s %-12s %-12s %-12s", @l;
+                       @l = ();
+               }
+               my $uref = Route::User::get($call);
+               my $s = $call;
+               if ($uref) {
+                       $s = sprintf "(%s)", $call unless $uref->here;
+               } else {
+                       $s = "$call?";
+               }
+               push @l, $s;
+       }
+       push @l, "" while @l < 5;
+       push @out, sprintf "%-12s %-12s %-12s %-12s %-12s", @l;
 }
 
 return (1, @out);
+