added builtin sh.qsl command

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

diff --git a/cmd/show/node.pl b/cmd/show/node.pl
index 9bc77e2a031f454c51c3983ce58c000c6cd4f179..46e0b32d9d66e072d6896fce55191a6a052ad34f 100644 (file)
--- a/cmd/show/node.pl
+++ b/cmd/show/node.pl
@@ -19,23 +19,25 @@ return (1, $self->msg('e5')) unless $self->priv >= 1;
 
 my @call = map {uc $_} split /\s+/, $line; 
 my @out;
+my $count;
 
 # search thru the user for nodes
-unless (@call) {
-       use DB_File;
-       
-       my ($action, $count, $key, $data);
-       for ($action = R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = R_NEXT) {
+if ($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) {
                if ($data =~ m{sort => '[ACRSX]'}) {
                    push @call, $key;
+                       ++$count;
                }
-               ++$count;
        } 
+} elsif (@call == 0) {
+       @call = map {$_->call} DXChannel::get_all_nodes();  
 }
 
 my $call;
 foreach $call (@call) {
-       my $clref = DXCluster->get_exact($call);
+       my $clref = Route::Node::get($call);
        my $uref = DXUser->get_current($call);
        my ($sort, $ver);
        
@@ -58,7 +60,7 @@ foreach $call (@call) {
                $sort = "Spider";
                $ver = $main::version;
        } else {
-               $ver = $clref->pcversion if $clref && $clref->pcversion;
+               $ver = $clref->version if $clref && $clref->version;
        }
        
        my ($major, $minor, $subs) = unpack("AAA*", $ver) if $ver;
@@ -67,6 +69,7 @@ foreach $call (@call) {
        } else {
                push @out, $self->msg('snode2', $pcall, $sort, $ver ? "$major\-$minor.$subs" : "      ");
        }
+    ++$count;
 }
 
 return (1, @out, $self->msg('rec', $count));