X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fconfiguration.pl;h=3101c5352f0466d95e615ee5d98bea914c928036;hb=HEAD;hp=09521cb6b7406e3d062994c90158243df744b857;hpb=6230850db2f82835e5ef75da4f418615ba4261da;p=spider.git diff --git a/cmd/show/configuration.pl b/cmd/show/configuration.pl index 09521cb6..3101c535 100644 --- a/cmd/show/configuration.pl +++ b/cmd/show/configuration.pl @@ -3,7 +3,7 @@ # # Copyright (c) 1998 Dirk Koopman G1TLH # -# $Id$ +# # my ($self, $line) = @_; @@ -16,15 +16,18 @@ my @val; push @out, $self->msg('showconf'); if ($list[0] && $list[0] =~ /^NOD/) { - my @ch = sort {$a->call cmp $b->call} DXChannel::get_all_nodes(); + my %ch; my $dxchan; - foreach $dxchan (@ch) { - @val = sort {$a->call cmp $b->call} grep { $_->dxchan && $_->dxchan == $dxchan } @nodes; + foreach my $n (@nodes) { + $dxchan = $n->dxchan; + push @{$ch{$dxchan->call}}, $n if $dxchan; + } + + foreach my $call (sort keys %ch) { + @val = sort {$a->call cmp $b->call} @{$ch{$call}}; @l = (); - my $call = $dxchan->call; - $call ||= '???'; - $call = "($call)" unless $dxchan->here; + $call = "($call)" unless DXChannel::get($call)->here; push @l, $call; foreach my $ref (@val) {