X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fconfiguration.pl;h=3386a1716e5a65404ce7398a0d59378a6e712dd9;hb=da65011693cc9a7a33f09424f7a19a51937d986c;hp=cb9f1946297d79179a720c10f675fb23016cc7ee;hpb=1256794cae0d863c829011df3f87dc1fb70f977d;p=spider.git diff --git a/cmd/show/configuration.pl b/cmd/show/configuration.pl index cb9f1946..3386a171 100644 --- a/cmd/show/configuration.pl +++ b/cmd/show/configuration.pl @@ -14,7 +14,7 @@ my $node; my @l; my @val; -push @out, "Node Callsigns"; +push @out, $self->msg('showconf'); if ($list[0] && $list[0] =~ /^NOD/) { my @ch = sort {$a->call cmp $b->call} DXChannel::get_all_nodes(); my $dxchan; @@ -45,9 +45,19 @@ if ($list[0] && $list[0] =~ /^NOD/) { push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l; } } else { + my $printall; + + $printall = 1 if @list && $list[0] =~ /^ALL/i; + # build up the screen from the Node table foreach $node (@nodes) { - next if scalar @list && !grep $node->call =~ /^$_/, @list; + unless ($printall) { + if (@list) { + next unless grep $node->call =~ /^$_/, @list; + } else { + next unless grep $node->dxcc == $_, @main::my_cc; + } + } my $call = $node->call; @l = (); $call ||= '???';