projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
slightly modified specially for ARC
[spider.git]
/
cmd
/
show
/
configuration.pl
diff --git
a/cmd/show/configuration.pl
b/cmd/show/configuration.pl
index a49ffeec990317d55cafc473b502627d150a785d..af81ad2101610eab36832f2e41dc34a098f7e9af 100644
(file)
--- a/
cmd/show/configuration.pl
+++ b/
cmd/show/configuration.pl
@@
-14,40
+14,54
@@
my $node;
my @l;
my @val;
my @l;
my @val;
-push @out,
"Node Callsigns"
;
+push @out,
$self->msg('showconf')
;
if ($list[0] && $list[0] =~ /^NOD/) {
if ($list[0] && $list[0] =~ /^NOD/) {
- my @ch = sort {$a->call cmp $b->call}
DXChannel::get_all_nodes
();
+ my @ch = sort {$a->call cmp $b->call}
grep {$_->is_node || $_->is_aranea} DXChannel::get_all
();
my $dxchan;
foreach $dxchan (@ch) {
@val = sort {$a->call cmp $b->call} grep { $_->dxchan == $dxchan } @nodes;
my $dxchan;
foreach $dxchan (@ch) {
@val = sort {$a->call cmp $b->call} grep { $_->dxchan == $dxchan } @nodes;
- my $call = $dxchan->call;
- $call = "($call)" if $dxchan->here == 0;
@l = ();
@l = ();
+ my $call = $dxchan->call;
+ $call ||= '???';
+ $call = "($call)" unless $dxchan->here;
push @l, $call;
my $i = 0;
push @l, $call;
my $i = 0;
- foreach
$call
(@val) {
+ foreach
my $ref
(@val) {
if ($i >= 5) {
push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
@l = ();
push @l, "";
$i = 0;
}
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 unless $call->here;
+ my $s = $ref->call;
+ $s ||= '???';
+ $s = sprintf "(%s)", $s unless $ref->here;
push @l, $s;
$i++;
}
push @l, $s;
$i++;
}
+ push @l, "" while ($i++ < 5);
push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
}
} else {
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) {
# 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;
my $call = $node->call;
- $call = "($call)" unless $node->here;
@l = ();
@l = ();
+ $call ||= '???';
+ $call = "($call)" unless $node->here;
push @l, $call;
@val = sort $node->users;
push @l, $call;
@val = sort $node->users;
@@
-72,6
+86,7
@@
if ($list[0] && $list[0] =~ /^NOD/) {
push @l, $s;
$i++;
}
push @l, $s;
$i++;
}
+ push @l, "" while ($i++ < 5);
push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
}
}
push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
}
}