projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix set/here and unset/here
[spider.git]
/
perl
/
Route.pm
diff --git
a/perl/Route.pm
b/perl/Route.pm
index 0150d5bfd3b92b7c7d3cf8c391ce30ca1f089756..521068b023cba2c2e1358140f549d667d8b1d0c9 100644
(file)
--- a/
perl/Route.pm
+++ b/
perl/Route.pm
@@
-58,6
+58,7
@@
sub new
$self->{itu} = $dxcc[1]->itu;
$self->{cq} = $dxcc[1]->cq;
}
$self->{itu} = $dxcc[1]->itu;
$self->{cq} = $dxcc[1]->cq;
}
+ $self->{flags} = here(1);
return $self;
}
return $self;
}
@@
-111,14
+112,20
@@
sub _dellist
#
# flag field constructors/enquirers
#
#
# flag field constructors/enquirers
#
+# These can be called in various ways:-
+#
+# Route::here or $ref->here returns 1 or 0 depending on value of the here flag
+# Route::here(1) returns 2 (the bit value of the here flag)
+# $ref->here(1) or $ref->here(0) sets the here flag
+#
sub here
{
my $self = shift;
my $r = shift;
return $self ? 2 : 0 unless ref $self;
sub here
{
my $self = shift;
my $r = shift;
return $self ? 2 : 0 unless ref $self;
- return ($self->{flags} & 2) ? 1 : 0 unless $r;
- $self->{flags} = (($self->{flags} & ~2) | ($r ?
1
: 0));
+ return ($self->{flags} & 2) ? 1 : 0 unless
defined
$r;
+ $self->{flags} = (($self->{flags} & ~2) | ($r ?
2
: 0));
return $r ? 1 : 0;
}
return $r ? 1 : 0;
}
@@
-127,7
+134,7
@@
sub conf
my $self = shift;
my $r = shift;
return $self ? 1 : 0 unless ref $self;
my $self = shift;
my $r = shift;
return $self ? 1 : 0 unless ref $self;
- return ($self->{flags} & 1) ? 1 : 0 unless $r;
+ return ($self->{flags} & 1) ? 1 : 0 unless
defined
$r;
$self->{flags} = (($self->{flags} & ~1) | ($r ? 1 : 0));
return $r ? 1 : 0;
}
$self->{flags} = (($self->{flags} & ~1) | ($r ? 1 : 0));
return $r ? 1 : 0;
}
@@
-154,6
+161,7
@@
sub config
my $self = shift;
my $nodes_only = shift;
my $level = shift;
my $self = shift;
my $nodes_only = shift;
my $level = shift;
+ my $seen = shift;
my @out;
my $line;
my $call = $self->user_call;
my @out;
my $line;
my $call = $self->user_call;
@@
-167,6
+175,16
@@
sub config
if ($printit) {
$line = ' ' x ($level*2) . "$call";
$call = ' ' x length $call;
if ($printit) {
$line = ' ' x ($level*2) . "$call";
$call = ' ' x length $call;
+
+ # recursion detector
+ if ((DXChannel->get($self->{call}) && $level > 1) || grep $self->{call} eq $_, @$seen) {
+ $line .= ' ...';
+ push @out, $line;
+ return @out;
+ }
+ push @$seen, $self->{call};
+
+ # print users
unless ($nodes_only) {
if (@{$self->{users}}) {
$line .= '->';
unless ($nodes_only) {
if (@{$self->{users}}) {
$line .= '->';
@@
-193,12
+211,14
@@
sub config
push @out, $line if length $line;
}
push @out, $line if length $line;
}
+ # deal with more nodes
foreach my $ncall (sort @{$self->{nodes}}) {
my $nref = Route::Node::get($ncall);
if ($nref) {
my $c = $nref->user_call;
foreach my $ncall (sort @{$self->{nodes}}) {
my $nref = Route::Node::get($ncall);
if ($nref) {
my $c = $nref->user_call;
- push @out, $nref->config($nodes_only, $level+1, @_);
+ dbg('routec', "recursing from $call -> $c");
+ push @out, $nref->config($nodes_only, $level+1, $seen, @_);
} else {
push @out, ' ' x (($level+1)*2) . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_);
}
} else {
push @out, ' ' x (($level+1)*2) . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_);
}
@@
-241,7
+261,7
@@
sub alldxchan
foreach my $p (@{$self->{parent}}) {
my $dxchan = DXChannel->get($p);
if ($dxchan) {
foreach my $p (@{$self->{parent}}) {
my $dxchan = DXChannel->get($p);
if ($dxchan) {
- push @dxchan, $dxchan
if grep $dxchan ne
$_, @dxchan;
+ push @dxchan, $dxchan
unless grep $dxchan ==
$_, @dxchan;
} else {
next if $p eq $main::mycall; # the root
my $ref = $self->get($p);
} else {
next if $p eq $main::mycall; # the root
my $ref = $self->get($p);
@@
-255,7
+275,7
@@
sub dxchan
{
my $self = shift;
my $dxchan = DXChannel->get($self->{call});
{
my $self = shift;
my $dxchan = DXChannel->get($self->{call});
- return $dxchan
=
$dxchan;
+ return $dxchan
if
$dxchan;
my @dxchan = $self->alldxchan;
return undef unless @dxchan;
my @dxchan = $self->alldxchan;
return undef unless @dxchan;