From: Dirk Koopman Date: Sat, 23 Jun 2007 21:42:09 +0000 (+0100) Subject: fixed Route::findroutes X-Git-Tag: 1.55~144 X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=99e970eab7e843c6810039bc85f462b270534a62;p=spider.git fixed Route::findroutes --- diff --git a/perl/Route.pm b/perl/Route.pm index 1106892a..d4fb95d4 100644 --- a/perl/Route.pm +++ b/perl/Route.pm @@ -298,15 +298,15 @@ sub findroutes return () if $seen->{$call}; if (my $dxchan = DXChannel::get($call)) { $seen->{$call}++; - push @out, [$level, $dxchan]; + push @out, $level ? [$level, $dxchan] : $dxchan; return @out; } # deal with more nodes - my $nref = Route::Node::get($call); - foreach my $ncall (@{$nref->{nodes}}) { + my $nref = Route::get($call); + foreach my $ncall (@{$nref->{parent}}) { dbg("recursing from $call -> $ncall") if isdbg('routec'); - my @rout = findroute($ncall, $level+1, $seen); + my @rout = findroutes($ncall, $level+1, $seen); push @out, @rout; } diff --git a/perl/Version.pm b/perl/Version.pm index af05086e..8816fa97 100644 --- a/perl/Version.pm +++ b/perl/Version.pm @@ -11,6 +11,6 @@ use vars qw($version $subversion $build); $version = '1.54'; $subversion = '0'; -$build = '70'; +$build = '71'; 1;