#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
-# $Id$
+#
#
my ($self, $line) = @_;
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 } @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) {
- if (@l >= 5) {
+ if (@l >= 6) {
push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
@l = ();
push @l, "";
$s = sprintf "(%s)", $s unless $ref->here;
push @l, $s;
}
- push @l, "" while @l < 5;
+ push @l, "" while @l < 6;
push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
}
} else {