X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fnode.pl;h=c684336d08650378169100f7f270f59dd2f2d5de;hb=f63d598af3f797b56b8d5e23ec4ff5254192eee9;hp=c18d8fb9376dc8d71e18c48ac68243dfd5dcd8a0;hpb=91cb091ed723c5650202345ae9c4f0277e36f0a8;p=spider.git

diff --git a/cmd/show/node.pl b/cmd/show/node.pl
index c18d8fb9..c684336d 100644
--- a/cmd/show/node.pl
+++ b/cmd/show/node.pl
@@ -11,67 +11,86 @@
 #
 # 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) {
-#  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 ($data =~ m{sort => '[ACRSX]'}) {
+if (@call == 0) {
+	@call = map {$_->call} DXChannel::get_all_nodes();
+} elsif ($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;
 		}
-		++$count;
-	} 
+	}
 }
 
 my $call;
-foreach $call (@call) {
-	my $clref = DXCluster->get_exact($call);
-	my $uref = DXUser->get_current($call);
-	my ($sort, $ver);
+foreach $call (sort @call) {
+	my $clref = Route::Node::get($call);
+	my $uref = DXUser::get_current($call);
+	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 = "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;
 	}
+	$ver = "";
+	$build = "";
 	if ($call eq $main::mycall) {
 		$sort = "Spider";
 		$ver = $main::version;
+		$build = $main::build;
 	} else {
-		$ver = $clref->pcversion if $clref && $clref->pcversion;
+		$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";
 	}
 	
-	my ($major, $minor, $subs) = unpack("AAA*", $ver) if $ver;
-	if ($uref->is_spider) {
-		push @out, $self->msg('snode2', $pcall, $sort, "$ver  ");
+	if ($uref->is_spider || ($clref && $clref->do_pc9x)) {
+		if ($ver && $ver > 5400) {
+			$ver =~ s/^5\d/5./;
+		}
+		if ($clref && $clref->build) {
+			$build = $clref->build
+		} elsif ($uref->build) {
+			$build = $uref->build;
+		}
+		if ($build) {
+			$build =~ s/^0\.//;
+			$build = "build: $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;
 }
 
-return (1, @out);
+return (1, @out, $self->msg('rec', $count));