add DXCIDR, fix version no tracking

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

diff --git a/cmd/show/node.pl b/cmd/show/node.pl
index e5e0eba58a00bb9ebb1ae2ffb742ef260accc5b2..c684336d08650378169100f7f270f59dd2f2d5de 100644 (file)
--- a/cmd/show/node.pl
+++ b/cmd/show/node.pl
@@ -11,7 +11,7 @@
 #
 # Copyright (c) 2000 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -23,7 +23,9 @@ my @out;
 my $count;
 
 # search thru the user for nodes
-if ($call[0] eq 'ALL') {
+if (@call == 0) {
+       @call = map {$_->call} DXChannel::get_all_nodes();
+} elsif ($call[0] eq 'ALL') {
        shift @call;
        my ($action, $key, $data) = (0,0,0);
        for ($action = DXUser::R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = DXUser::R_NEXT) {
@@ -31,28 +33,26 @@ if ($call[0] eq 'ALL') {
                    push @call, $key;
                        ++$count;
                }
-       } 
-} elsif (@call == 0) {
-       @call = map {$_->call} DXChannel::get_all_nodes();  
+       }
 }
 
 my $call;
-foreach $call (@call) {
+foreach $call (sort @call) {
        my $clref = Route::Node::get($call);
-       my $uref = DXUser->get_current($call);
+       my $uref = DXUser::get_current($call);
        my ($sort, $ver, $build);
        
        my $pcall = sprintf "%-11s", $call;
        push @out, $self->msg('snode1') unless @out > 0;
        if ($uref) {
-               $sort = "Unknwn";
-               $sort = "Spider" if $uref->is_spider;
-               $sort = "AK1A  " if $uref->is_ak1a;
+               $sort = "Spider" if $uref->is_spider || ($clref && $clref->do_pc9x);
                $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;
+               $sort = "AK1A  " if !$sort && $uref->is_ak1a;
+               $sort = "Unknwn" unless $sort;
        } else {
                push @out, $self->msg('snode3', $call);
                next;
@@ -62,17 +62,29 @@ foreach $call (@call) {
        if ($call eq $main::mycall) {
                $sort = "Spider";
                $ver = $main::version;
+               $build = $main::build;
        } else {
                $ver = $clref->version if $clref && $clref->version;
-               $ver = $uref->version if $ver && $uref->version;
+               $ver = $uref->version if !$ver && $uref->version;
+               $sort = "CCClus" if $ver && $ver >= 1000 && $ver < 4000 && $sort eq "Spider";
        }
        
-       my ($major, $minor, $subs) = unpack("AAA*", $ver) if $ver;
-       if ($uref->is_spider) {
-               $ver -= 53 if $ver > 54;
-               $build = "build: " . $uref->build if $uref->build;
+       if ($uref->is_spider || ($clref && $clref->do_pc9x)) {
+               if ($ver && $ver > 5400) {
+                       $ver =~ s/^5\d/5./;
+               }
+               if ($clref && $clref->build) {
+                       $build = $clref->build
+               } elsif ($uref->build) {
+                       $build = $uref->build;
+               }
+               if ($build) {
+                       $build =~ s/^0\.//;
+                       $build = "build: $build";
+               }
                push @out, $self->msg('snode2', $pcall, $sort, "$ver $build");
        } else {
+               my ($major, $minor, $subs) = unpack("AAA*", $ver) if $ver;
                push @out, $self->msg('snode2', $pcall, $sort, $ver ? "$major\-$minor.$subs" : "      ");
        }
     ++$count;