X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fconfiguration.pl;h=4cd50e2668a371e090cbf961f0cc8e5ad350a25b;hb=a9b7071fedfdb2150f3ef3d74e0d626b4f2dc0ea;hp=62beea66a7334ffb27724ecfaa8fff7ba350bf63;hpb=4d3067793942b3f4518615906dde50db5b76464a;p=spider.git

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