added shellregex

[spider.git] / cmd / show / configuration.pl

diff --git a/cmd/show/configuration.pl b/cmd/show/configuration.pl
index a7a1773b1391acc722d53d8d4be5217c04a01cee..6f2e1e935a8014f06c5373138675fc0de94d7307 100644 (file)
--- a/cmd/show/configuration.pl
+++ b/cmd/show/configuration.pl
@@ -9,18 +9,18 @@
 my ($self, $line) = @_;
 my @list = map { uc } split /\s+/, $line;           # list of callsigns of nodes
 my @out;
-my @nodes = (DXNode::get_all());
+my @nodes = sort {$a->call cmp $b->call} (DXNode::get_all());
 my $node;
 my @l;
 my @val;
 
 push @out, "Node         Callsigns";
 if ($list[0] && $list[0] =~ /^NOD/) {
-       my @ch = DXProt::get_all_ak1a();
+       my @ch = sort {$a->call cmp $b->call} DXProt::get_all_ak1a();
        my $dxchan;
        
        foreach $dxchan (@ch) {
-               @val = grep { $_->dxchan == $dxchan } @nodes;
+               @val = sort {$a->call cmp $b->call} grep { $_->dxchan == $dxchan } @nodes;
                my $call = $dxchan->call;
                $call = "($call)" if $dxchan->here == 0;
                @l = ();
@@ -50,9 +50,12 @@ if ($list[0] && $list[0] =~ /^NOD/) {
                @l = ();
                push @l, $call;
                my $nlist = $node->list;
-               @val = values %{$nlist};
+               @val = sort {$a->call cmp $b->call} values %{$nlist};
 
                my $i = 0;
+               if (@val == 0 && $node->users) {
+                       push @l, sprintf "(%d users)", $node->users;
+               }
                foreach $call (@val) {
                        if ($i >= 5) {
                                push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;