fixed Route::findroutes
authorDirk Koopman <djk@tobit.co.uk>
Sat, 23 Jun 2007 21:42:09 +0000 (22:42 +0100)
committerDirk Koopman <djk@tobit.co.uk>
Sat, 23 Jun 2007 21:42:09 +0000 (22:42 +0100)
perl/Route.pm
perl/Version.pm

index 1106892a167c8641147ac76fa02d9118a13057eb..d4fb95d4205eae5143959c9c6efd130b0da1eb43 100644 (file)
@@ -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;
        }
 
index af05086e56cabfbabb96e25ad7229fc533d20c09..8816fa97cb375e59bd9b9dfc3fe99886ffa22b94 100644 (file)
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '70';
+$build = '71';
 
 1;