X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=61d07249917a889028eba36f8f9c694e8ad9a0ab;hb=101516b420ac77cd9eb8294651104e43f3461c06;hp=521068b023cba2c2e1358140f549d667d8b1d0c9;hpb=125670de1ca386c044416d59935cfad9e1759c06;p=spider.git

diff --git a/perl/Route.pm b/perl/Route.pm
index 521068b0..61d07249 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -49,7 +49,7 @@ sub new
 	$pkg = ref $pkg if ref $pkg;
 
 	my $self = bless {call => $call}, $pkg;
-	dbg('routelow', "create $pkg with $call");
+	dbg("create $pkg with $call") if isdbg('routelow');
 
 	# add in all the dxcc, itu, zone info
 	my @dxcc = Prefix::extract($call);
@@ -89,7 +89,7 @@ sub _addlist
 		my $call = _getcall($c);
 		unless (grep {$_ eq $call} @{$self->{$field}}) {
 			push @{$self->{$field}}, $call;
-			dbg('routelow', ref($self) . " adding $call to " . $self->{call} . "->\{$field\}");
+			dbg(ref($self) . " adding $call to " . $self->{call} . "->\{$field\}") if isdbg('routelow');
 		}
 	}
 	return $self->{$field};
@@ -103,7 +103,7 @@ sub _dellist
 		my $call = _getcall($c);
 		if (grep {$_ eq $call} @{$self->{$field}}) {
 			$self->{$field} = [ grep {$_ ne $call} @{$self->{$field}} ];
-			dbg('routelow', ref($self) . " deleting $call from " . $self->{call} . "->\{$field\}");
+			dbg(ref($self) . " deleting $call from " . $self->{call} . "->\{$field\}") if isdbg('routelow');
 		}
 	}
 	return $self->{$field};
@@ -217,7 +217,7 @@ sub config
 
 		if ($nref) {
 			my $c = $nref->user_call;
-			dbg('routec', "recursing from $call -> $c");
+#			dbg("recursing from $call -> $c") if isdbg('routec');
 			push @out, $nref->config($nodes_only, $level+1, $seen, @_);
 		} else {
 			push @out, ' ' x (($level+1)*2)  . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_); 
@@ -253,35 +253,40 @@ sub alldxchan
 {
 	my $self = shift;
 	my @dxchan;
+#	dbg("Trying node $self->{call}") if isdbg('routech');
 	my $dxchan = DXChannel->get($self->{call});
 	push @dxchan, $dxchan if $dxchan;
 	
 	# it isn't, build up a list of dxchannels and possible ping times 
 	# for all the candidates.
-	foreach my $p (@{$self->{parent}}) {
-		my $dxchan = DXChannel->get($p);
-		if ($dxchan) {
-			push @dxchan, $dxchan unless grep $dxchan == $_, @dxchan;
-		} else {
+	unless (@dxchan) {
+		foreach my $p (@{$self->{parent}}) {
+#			dbg("Trying parent $p") if isdbg('routech');
 			next if $p eq $main::mycall; # the root
-			my $ref = $self->get($p);
-			push @dxchan, $ref->alldxchan if $ref;
+			my $dxchan = DXChannel->get($p);
+			if ($dxchan) {
+				push @dxchan, $dxchan unless grep $dxchan == $_, @dxchan;
+			} else {
+				next if grep $p eq $_, @_;
+				my $ref = Route::Node::get($p);
+#				dbg("Next node $p " . ($ref ? 'Found' : 'NOT Found') if isdbg('routech') );
+				push @dxchan, $ref->alldxchan($self->{call}, @_) if $ref;
+			}
 		}
 	}
+#	dbg('routech', "Got dxchan: " . join(',', (map{ $_->call } @dxchan)) );
 	return @dxchan;
 }
 
 sub dxchan
 {
 	my $self = shift;
-	my $dxchan = DXChannel->get($self->{call});
-	return $dxchan if $dxchan;
-	
 	my @dxchan = $self->alldxchan;
 	return undef unless @dxchan;
 	
 	# determine the minimum ping channel
 	my $minping = 99999999;
+	my $dxchan;
 	foreach my $dxc (@dxchan) {
 		my $p = $dxc->pingave;
 		if (defined $p  && $p < $minping) {
@@ -302,7 +307,7 @@ sub DESTROY
 	my $self = shift;
 	my $pkg = ref $self;
 	
-	dbg('routelow', "$pkg $self->{call} destroyed");
+	dbg("$pkg $self->{call} destroyed") if isdbg('routelow');
 }
 
 no strict;