X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fconfiguration.pl;h=ba0f38787e8c987246c21932323d261bb54f91c3;hb=ad09cf7c29d54881a3e1bb4b8e5da30c2f58c4b6;hp=4cd50e2668a371e090cbf961f0cc8e5ad350a25b;hpb=a9b7071fedfdb2150f3ef3d74e0d626b4f2dc0ea;p=spider.git

diff --git a/cmd/show/configuration.pl b/cmd/show/configuration.pl
index 4cd50e26..ba0f3878 100644
--- a/cmd/show/configuration.pl
+++ b/cmd/show/configuration.pl
@@ -9,18 +9,18 @@
 my ($self, $line) = @_;
 my @list = map { uc } split /\s+/, $line;           # list of callsigns of nodes
 my @out;
-my @nodes = (DXNode::get_all());
+my @nodes = sort {$a->call cmp $b->call} (DXNode::get_all());
 my $node;
 my @l;
 my @val;
 
 push @out, "Node         Callsigns";
-if ($list[0] =~ /^NOD/) {
-	my @ch = DXProt::get_all_ak1a();
+if ($list[0] && $list[0] =~ /^NOD/) {
+	my @ch = sort {$a->call cmp $b->call} DXChannel::get_all_nodes();
 	my $dxchan;
 	
 	foreach $dxchan (@ch) {
-		@val = grep { $_->dxchan == $dxchan } @nodes;
+		@val = sort {$a->call cmp $b->call} grep { $_->dxchan == $dxchan } @nodes;
 		my $call = $dxchan->call;
 		$call = "($call)" if $dxchan->here == 0;
 		@l = ();
@@ -44,15 +44,18 @@ if ($list[0] =~ /^NOD/) {
 } else {
 	# build up the screen from the Node table
 	foreach $node (@nodes) {
-		next if scalar @list && !grep $node->call eq $_, @list;
+		next if scalar @list && !grep $node->call =~ /^$_/, @list;
 		my $call = $node->call;
 		$call = "($call)" if $node->here == 0;
 		@l = ();
 		push @l, $call;
 		my $nlist = $node->list;
-		@val = values %{$nlist};
+		@val = sort {$a->call cmp $b->call} values %{$nlist};
 
 		my $i = 0;
+		if (@val == 0 && $node->users) {
+			push @l, sprintf "(%d users)", $node->users;
+		}
 		foreach $call (@val) {
 			if ($i >= 5) {
 				push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;