sort show/node output

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

diff --git a/cmd/show/node.pl b/cmd/show/node.pl
index 4e8125514c48a73dddc7d683e246304490151641..66379435d076dcf8628181c0ba6a552cdb002676 100644 (file)
--- a/cmd/show/node.pl
+++ b/cmd/show/node.pl
@@ -37,7 +37,7 @@ if (@call == 0) {
 }
 
 my $call;
-foreach $call (@call) {
+foreach $call (sort @call) {
        my $clref = Route::Node::get($call);
        my $uref = DXUser->get_current($call);
        my ($sort, $ver, $build);
@@ -45,14 +45,14 @@ foreach $call (@call) {
        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;
@@ -64,16 +64,20 @@ foreach $call (@call) {
                $ver = $main::version;
        } else {
                $ver = $clref->version if $clref && $clref->version;
-               $ver = $uref->version if $ver && $uref->version;
+               $ver = $uref->version if !$ver && $uref->version;
        }
        
-       my ($major, $minor, $subs) = unpack("AAA*", $ver) if $ver;
-       if ($uref->is_spider) {
+       if ($uref->is_spider || ($clref && $clref->do_pc9x)) {
                $ver /= 100 if $ver > 5400;
                $ver -= 53 if $ver > 54;
-               $build = "build: " . $uref->build if $uref->build;
+               if ($clref && $clref->build) {
+                       $build = "build: " . $clref->build
+               } elsif ($uref->build) {
+                       $build = "build: " . $uref->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;