X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=abc098471e7edaf0e7a721887a778359a77b3571;hb=4fc769825208defe992b60c1374a236f2cdba925;hp=415d1744f2f7ebcf263d55c9930797d27cf30303;hpb=fd0a34c34ad4112ee21e0730f7307498ff437e18;p=spider.git

diff --git a/perl/Route.pm b/perl/Route.pm
index 415d1744..abc09847 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -200,7 +200,7 @@ sub config
 		$pcall .= ":" . $self->obscount if isdbg('obscount');
 
 
-		$line = ' ' x ($level*2) . "$pcall";
+		$line = ' ' x ($level*2) . $pcall;
 		$pcall = ' ' x length $pcall;
 
 		# recursion detector
@@ -296,6 +296,8 @@ sub findroutes
 
 	# recursion detector
 	return () if $seen->{$call};
+
+	# return immediately if we are directly connected
 	if (my $dxchan = DXChannel::get($call)) {
 		$seen->{$call}++;
 		push @out, $level ? [$level, $dxchan] : $dxchan;
@@ -305,15 +307,46 @@ sub findroutes
 
 	# deal with more nodes
 	my $nref = Route::get($call);
+	return () unless $nref;
 	foreach my $ncall (@{$nref->{parent}}) {
 		unless ($seen->{$ncall}) {
-			dbg("recursing from $call -> $ncall") if isdbg('routec');
-			my @rout = findroutes($ncall, $level+1, $seen);
+
+			# put non-pc9x nodes to the back of the queue
+			my $l = $level + ($nref->{do_pc9x} && ($nref->{version}||5454) >= 5454 ? 0 : 30);
+			dbg("recursing from $call -> $ncall level $l") if isdbg('routec');
+			my @rout = findroutes($ncall, $l+1, $seen);
 			push @out, @rout;
 		}
 	}
 
-	return $level == 0 ? map {$_->[1]} sort {$a->[0] <=> $b->[0]} @out : @out;
+	if ($level == 0) {
+		my @nout = map {$_->[1]} sort {$a->[0] <=> $b->[0]} @out;
+		my $last;
+		if ($nref->isa('Route::Node')) {
+			my $ncall = $nref->PC92C_dxchan;
+			$last = DXChannel::get($ncall) if $ncall;
+		} else {
+			my $pcall = $nref->{parent}->[0];
+			my ($ref, $ncall);
+			$ref = Route::Node::get($pcall) if $pcall;
+			$ncall = $ref->PC92C_dxchan if $ref;
+			$last = DXChannel::get($ncall) if $ncall;
+		}
+
+		if (isdbg('findroutes')) {
+			if (@out) {
+				foreach (sort {$a->[0] <=> $b->[0]} @out) {
+					dbg("ROUTE: findroute $call -> $_->[0] " . $_->[1]->call);
+				}
+			} else {
+				dbg("ROUTE: findroute $call -> PC92C_dxchan " . $last->call) if $last;
+			}
+		}
+		push @nout, $last if @out == 0 && $last;
+		return @nout;
+	} else {
+		return @out;
+	}
 }
 
 # find all the possible dxchannels which this object might be on