projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
really fix cc cluster recognition
[spider.git]
/
perl
/
Route.pm
diff --git
a/perl/Route.pm
b/perl/Route.pm
index 3f264846bd74ff4210b9276e7c6ce7e4e542ab44..a8820ea4fd228510d28f345ecc6913184ee2abd5 100644
(file)
--- a/
perl/Route.pm
+++ b/
perl/Route.pm
@@
-25,15
+25,15
@@
use strict;
use vars qw(%list %valid $filterdef $maxlevel);
%valid = (
use vars qw(%list %valid $filterdef $maxlevel);
%valid = (
- parent => '0,Parent Calls,parray',
call => "0,Callsign",
call => "0,Callsign",
- flags => "0,Flags,phex",
+ city => '0,City',
+ cq => '0,CQ Zone',
dxcc => '0,Country Code',
dxcc => '0,Country Code',
+ flags => "0,Flags,phex",
+ ip => '0,IP Address',
itu => '0,ITU Zone',
itu => '0,ITU Zone',
-
cq => '0,CQ Zone
',
+
parent => '0,Parent Calls,parray
',
state => '0,State',
state => '0,State',
- city => '0,City',
- ip => '0,IP Address',
);
$filterdef = bless ([
);
$filterdef = bless ([
@@
-224,12
+224,14
@@
sub config
my $c;
if ($uref) {
$c = $uref->user_call;
my $c;
if ($uref) {
$c = $uref->user_call;
- } else {
+ }
+ else {
$c = "$ucall?";
}
if ((length $line) + (length $c) + 1 < $width) {
$line .= $c . ' ';
$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 ";
$line =~ s/\s+$//;
push @out, $line;
$line = ' ' x ($level*2) . "$pcall->$c ";
@@
-240,7
+242,8
@@
sub config
$line =~ s/->$//g;
$line =~ s/\s+$//;
push @out, $line if length $line;
$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;
# recursion detector
if ((DXChannel::get($call) && $level > 1) || $seen->{$call} || $level > $maxlevel) {
return @out;