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 66379435d076dcf8628181c0ba6a552cdb002676..c684336d08650378169100f7f270f59dd2f2d5de 100644 (file)
--- a/cmd/show/node.pl
+++ b/cmd/show/node.pl
@@ -39,7 +39,7 @@ if (@call == 0) {
 my $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;
@@ -62,18 +62,25 @@ foreach $call (sort @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;
+               $sort = "CCClus" if $ver && $ver >= 1000 && $ver < 4000 && $sort eq "Spider";
        }
        
        if ($uref->is_spider || ($clref && $clref->do_pc9x)) {
-               $ver /= 100 if $ver > 5400;
-               $ver -= 53 if $ver > 54;
+               if ($ver && $ver > 5400) {
+                       $ver =~ s/^5\d/5./;
+               }
                if ($clref && $clref->build) {
-                       $build = "build: " . $clref->build
+                       $build = $clref->build
                } elsif ($uref->build) {
-                       $build = "build: " . $uref->build;
+                       $build = $uref->build;
+               }
+               if ($build) {
+                       $build =~ s/^0\.//;
+                       $build = "build: $build";
                }
                push @out, $self->msg('snode2', $pcall, $sort, "$ver $build");
        } else {