X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fnode.pl;h=f8e711776d9c3ef4afdb017231593d8113641979;hb=f2a65bc2f8ad7069cadc59f8fd4d2ef390567dba;hp=fa4a3505fa0226374d8ac23d7b7fd0fa57c86dab;hpb=d0d643e52b8c7ab9f481c78edb8ab953a5da3b29;p=spider.git

diff --git a/cmd/show/node.pl b/cmd/show/node.pl
index fa4a3505..f8e71177 100644
--- a/cmd/show/node.pl
+++ b/cmd/show/node.pl
@@ -11,48 +11,48 @@
 #
 # 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
-if ($call[0] eq 'ALL') {
+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;
+		if (iscallsign($key)) {
+			if ($data =~ /"sort":"[ACRSX]"/) {
+				push @call, $key;
+			}
 		}
-	} 
-} elsif (@call == 0) {
-	@call = map {$_->call} DXChannel::get_all_nodes();  
+	}
 }
 
 my $call;
-foreach $call (@call) {
+foreach $call (sort @call) {
 	my $clref = Route::Node::get($call);
-	my $uref = DXUser->get_current($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;
@@ -64,16 +64,21 @@ 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;
+		$sort = "CCClus" if $ver >= 1000 && $ver < 4000 && $sort eq "Spider";
 	}
 	
-	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;