X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fnode.pl;h=53a974ca1627f30b3e926aa913fa1076faa329af;hb=668e4252d23e2eda2a6b234f1031e1c1a5f43d15;hp=c18d8fb9376dc8d71e18c48ac68243dfd5dcd8a0;hpb=91cb091ed723c5650202345ae9c4f0277e36f0a8;p=spider.git

diff --git a/cmd/show/node.pl b/cmd/show/node.pl
index c18d8fb9..53a974ca 100644
--- a/cmd/show/node.pl
+++ b/cmd/show/node.pl
@@ -17,27 +17,29 @@
 my ($self, $line) = @_;
 return (1, $self->msg('e5')) unless $self->priv >= 1;
 
+use DB_File;
+
 my @call = map {uc $_} split /\s+/, $line; 
 my @out;
+my $count;
 
 # search thru the user for nodes
-unless (@call) {
-#  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 ($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);
 	
@@ -60,7 +62,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;
@@ -69,9 +71,10 @@ foreach $call (@call) {
 	} else {
 		push @out, $self->msg('snode2', $pcall, $sort, $ver ? "$major\-$minor.$subs" : "      ");
 	}
+    ++$count;
 }
 
-return (1, @out);
+return (1, @out, $self->msg('rec', $count));