X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fconfiguration.pl;h=746ab4b0068390b9b32e8bc08c20a1fb3e35a221;hb=d4aacffb5581c9fc338833aebc996c27d3f16ada;hp=09521cb6b7406e3d062994c90158243df744b857;hpb=4eef5ad5a1da19f091f3c6f1e50c60772db40a4c;p=spider.git diff --git a/cmd/show/configuration.pl b/cmd/show/configuration.pl index 09521cb6..746ab4b0 100644 --- a/cmd/show/configuration.pl +++ b/cmd/show/configuration.pl @@ -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; + } + + 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) {