added a forward/latlong command

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

diff --git a/cmd/show/node.pl b/cmd/show/node.pl
index e51b97c36f6f640169c17204926c4c715c99e387..c18d8fb9376dc8d71e18c48ac68243dfd5dcd8a0 100644 (file)
--- a/cmd/show/node.pl
+++ b/cmd/show/node.pl
@@ -22,7 +22,17 @@ my @out;
 
 # search thru the user for nodes
 unless (@call) {
-       @call = sort map { my $ref; (($ref = DXUser->get_current($_)) && $ref->sort ne 'U') ? $_ : () } DXUser::get_all_calls;
+#  the official way
+#      @call = sort map { my $ref; (($ref = DXUser->get_current($_)) && $ref->sort ne 'U') ? $_ : () } DXUser::get_all_calls;
+       use DB_File;
+       
+       my ($action, $count, $key, $data);
+       for ($action = R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = R_NEXT) {
+               if ($data =~ m{sort => '[ACRSX]'}) {
+                   push @call, $key;
+               }
+               ++$count;
+       } 
 }
 
 my $call;
@@ -34,11 +44,14 @@ foreach $call (@call) {
        my $pcall = sprintf "%-11s", $call;
        push @out, $self->msg('snode1') unless @out > 0;
        if ($uref) {
-               $sort = "Spider" if $uref->sort eq 'S';
-               $sort = "AK1A  " if $uref->sort eq 'A';
-               $sort = "clx   " if $uref->sort eq 'C';
-               $sort = "Fred  " if $uref->sort eq 'U';
-               $sort = "BBS   " if $uref->sort eq 'B';
+               $sort = "Unknwn";
+               $sort = "Spider" if $uref->is_spider;
+               $sort = "AK1A  " if $uref->is_ak1a;
+               $sort = "Clx   " if $uref->is_clx;
+               $sort = "User  " if $uref->is_user;
+               $sort = "BBS   " if $uref->is_bbs;
+               $sort = "DXNet " if $uref->is_dxnet;
+               $sort = "ARClus" if $uref->is_arcluster;
        } else {
                push @out, $self->msg('snode3', $call);
                next;
@@ -51,7 +64,7 @@ foreach $call (@call) {
        }
        
        my ($major, $minor, $subs) = unpack("AAA*", $ver) if $ver;
-       if ($sort eq 'Spider') {
+       if ($uref->is_spider) {
                push @out, $self->msg('snode2', $pcall, $sort, "$ver  ");
        } else {
                push @out, $self->msg('snode2', $pcall, $sort, $ver ? "$major\-$minor.$subs" : "      ");
@@ -59,3 +72,7 @@ foreach $call (@call) {
 }
 
 return (1, @out);
+
+
+
+