merge various things from master

[spider.git] / perl / Route.pm

diff --git a/perl/Route.pm b/perl/Route.pm
index 81452decdb0f720b034acc9edd288f5125fe2958..a8820ea4fd228510d28f345ecc6913184ee2abd5 100644 (file)
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -26,13 +26,14 @@ use vars qw(%list %valid $filterdef $maxlevel);
 
 %valid = (
                  call => "0,Callsign",
-                 flags => "0,Flags,phex",
+                 city => '0,City',
+                 cq => '0,CQ Zone',
                  dxcc => '0,Country Code',
+                 flags => "0,Flags,phex",
+                 ip => '0,IP Address',
                  itu => '0,ITU Zone',
-                 cq => '0,CQ Zone',
+                 parent => '0,Parent Calls,parray',
                  state => '0,State',
-                 city => '0,City',
-                 ip => '0,IP Address',
                 );
 
 $filterdef = bless ([
@@ -223,12 +224,14 @@ sub config
                                        my $c;
                                        if ($uref) {
                                                $c = $uref->user_call;
-                                       } else {
+                                       }
+                                       else {
                                                $c = "$ucall?";
                                        }
                                        if ((length $line) + (length $c) + 1 < $width) {
                                                $line .= $c . ' ';
-                                       } else {
+                                       }
+                                       else {
                                                $line =~ s/\s+$//;
                                                push @out, $line;
                                                $line = ' ' x ($level*2) . "$pcall->$c ";
@@ -239,7 +242,8 @@ sub config
                $line =~ s/->$//g;
                $line =~ s/\s+$//;
                push @out, $line if length $line;
-       } else {
+       }
+       else {
                # recursion detector
                if ((DXChannel::get($call) && $level > 1) || $seen->{$call} || $level > $maxlevel) {
                        return @out;
@@ -271,10 +275,10 @@ sub cluster
 {
        my $nodes = Route::Node::count();
        my $tot = Route::User::count();
-       my ($users, $maxlocalusers) = DXCommandmode::user_count();
+       my ($users, $maxlocalusers) = DXCommandmode::user_count(); # the user count is wrong because of skimmers
        my $maxusers = Route::User::max();
        my $uptime = main::uptime();
-       my $localnodes = $DXChannel::count - $users;
+       my $localnodes = $DXChannel::count - $users;   # this is now wrong because of skimmers
        
        return ($nodes, $tot, $users, $maxlocalusers, $maxusers, $uptime, $localnodes);