X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=304b9c6830b97f77bde4767cc64ad954c2a310e1;hb=d235b0d777f1a90c65d5dcf8cd6adaeb9f2b7e99;hp=6c8c44a858653adc507374f7dea9099c6c2ff39f;hpb=63f0fc26e717837bc7c6990f27d26de91d65eb7e;p=spider.git diff --git a/perl/Route.pm b/perl/Route.pm index 6c8c44a8..304b9c68 100644 --- a/perl/Route.pm +++ b/perl/Route.pm @@ -25,6 +25,7 @@ use strict; use vars qw(%list %valid $filterdef $maxlevel); %valid = ( + parent => '0,Parent Calls,parray', call => "0,Callsign", flags => "0,Flags,phex", dxcc => '0,Country Code', @@ -32,6 +33,7 @@ use vars qw(%list %valid $filterdef $maxlevel); cq => '0,CQ Zone', state => '0,State', city => '0,City', + ip => '0,IP Address', ); $filterdef = bless ([ @@ -222,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 "; @@ -238,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; @@ -270,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);