X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fnode.pl;h=a1ab8eca18136b25070ca697901d0a3def9c98b7;hb=c3505bcfc922cd712bad2c20b3479cf8d1dc54fe;hp=37db1dc8d1e21f77a4773af97f575c1fbd58a484;hpb=bff9ecf00b14e7d71d9504088a2fd7b9e5115fe1;p=spider.git

diff --git a/cmd/show/node.pl b/cmd/show/node.pl
index 37db1dc8..a1ab8eca 100644
--- a/cmd/show/node.pl
+++ b/cmd/show/node.pl
@@ -11,29 +11,41 @@
 #
 # Copyright (c) 2000 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
 return (1, $self->msg('e5')) unless $self->priv >= 1;
+return (1, $self->msg('storable')) unless $DXUser::v3;
 
 my @call = map {uc $_} split /\s+/, $line; 
 my @out;
+my $count;
 
 # search thru the user for nodes
-unless (@call) {
-	@call = sort map { my $ref; (($ref = DXUser->get_current($_)) && $ref->sort ne 'U') ? $_ : () } DXUser::get_all_calls;
+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{\01[ACRSX]\0\0\0\04sort}) {
+		    push @call, $key;
+			++$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);
+	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 = "Clx   " if $uref->is_clx;
@@ -45,22 +57,29 @@ foreach $call (@call) {
 		push @out, $self->msg('snode3', $call);
 		next;
 	}
+	$ver = "";
+	$build = "";
 	if ($call eq $main::mycall) {
 		$sort = "Spider";
 		$ver = $main::version;
 	} else {
-		$ver = $clref->pcversion if $clref && $clref->pcversion;
+		$ver = $clref->version if $clref && $clref->version;
+		$ver = $uref->version if $ver && $uref->version;
 	}
 	
 	my ($major, $minor, $subs) = unpack("AAA*", $ver) if $ver;
-	if ($sort eq 'Spider') {
-		push @out, $self->msg('snode2', $pcall, $sort, "$ver  ");
+	if ($uref->is_spider) {
+		$ver /= 100 if $ver > 5400;
+		$ver -= 53 if $ver > 54;
+		$build = "build: " . $uref->build if $uref->build;
+		push @out, $self->msg('snode2', $pcall, $sort, "$ver $build");
 	} else {
 		push @out, $self->msg('snode2', $pcall, $sort, $ver ? "$major\-$minor.$subs" : "      ");
 	}
+    ++$count;
 }
 
-return (1, @out);
+return (1, @out, $self->msg('rec', $count));