From: minima <minima>
Date: Mon, 20 Jan 2003 13:35:28 +0000 (+0000)
Subject: fixed sh/c so it only show this country's nodes
X-Git-Tag: PRE-1-52~78
X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;ds=inline;h=f651e64ef06bd79eb2342e85d5dd7c86fee407d1;p=spider.git

fixed sh/c so it only show this country's nodes
---

diff --git a/Changes b/Changes
index 56326cca..ecd431bf 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+20Jan03=======================================================================
+1. changed sh/c so that, by default, it only shows the caller's country nodes
+sh/c all will show the old style full list. "sh/c sk gb" will show the config
+of all the GB and SK nodes.
 19Jan03=======================================================================
 1. I have made a fundemental change to the way PC19s are dealt with as a 
 result of the discussions on the mailing list. From now on, only nodes that
diff --git a/cmd/Aliases b/cmd/Aliases
index 390864ff..1f7218f3 100644
--- a/cmd/Aliases
+++ b/cmd/Aliases
@@ -115,6 +115,7 @@ package CmdAlias;
 	'^set$', 'apropos set', 'apropos',
 	  '^sho?w?/u$', 'show/user', 'show/user',
 	  '^sho?w?/bu', 'show/files bulletins', 'show/files',
+	  '^sho?w?/c/a', 'show/configuration all', 'show/configuration',
 	  '^sho?w?/c/n', 'show/configuration nodes', 'show/configuration',
 	  '^sho?w?/c$', 'show/configuration', 'show/configuration',
 	  '^sho?w?/com', 'dbavail', 'dbavail',
diff --git a/cmd/Commands_en.hlp b/cmd/Commands_en.hlp
index 5548afee..1ed57e97 100644
--- a/cmd/Commands_en.hlp
+++ b/cmd/Commands_en.hlp
@@ -1699,8 +1699,23 @@ and the nodes to which they are connected.
 
 This command is normally abbreviated to: sh/c
 
+Normally, the list returned will be just for the nodes from your 
+country (because the list otherwise will be very long).
+
+  SH/C ALL 
+
+will produce a complete list of all nodes. 
+
 BE WARNED: the list that is returned can be VERY long
 
+It is possible to supply a node or part of a prefix and you will get 
+a list of the users for that node or list of nodes starting with
+that prefix.
+
+  SH/C GB7DJK
+
+  SH/C SK
+
 === 0^SHOW/CONFIGURATION/NODE^Show all the nodes connected locally
 Show all the nodes connected to this node.
 
diff --git a/cmd/show/configuration.pl b/cmd/show/configuration.pl
index cb9f1946..51c39dd0 100644
--- a/cmd/show/configuration.pl
+++ b/cmd/show/configuration.pl
@@ -45,9 +45,19 @@ if ($list[0] && $list[0] =~ /^NOD/) {
 		push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
 	}
 } else {
+	my $printall;
+	
+	$printall = 1 if @list && $list[0] =~ /^ALL/i;
+	
 	# build up the screen from the Node table
 	foreach $node (@nodes) {
-		next if scalar @list && !grep $node->call =~ /^$_/, @list;
+		unless ($printall) {
+			if (@list) {
+				next unless grep $node->call =~ /^$_/, @list;
+			} else {
+				next unless $node->dxcc == $self->dxcc;
+			}
+		}
 		my $call = $node->call;
 		@l = ();
 		$call ||= '???';