X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=868317a9646234b9093a2598048a3a795f71e8d3;hb=22709bc68bb04f5ee548053956c88eeca42ad3b4;hp=290cd7628f10823e61611398bf48a8b95de9ba2c;hpb=fb9c2ab04977b4e685b0eca3b2a2d04a77f65f4b;p=spider.git

diff --git a/perl/Route.pm b/perl/Route.pm
index 290cd762..868317a9 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -181,6 +181,7 @@ sub config
 {
 	my $self = shift;
 	my $nodes_only = shift || 0;
+	my $width = shift || 79;
 	my $level = shift;
 	my $seen = shift;
 	my @out;
@@ -223,7 +224,7 @@ sub config
 					} else {
 						$c = "$ucall?";
 					}
-					if ((length $line) + (length $c) + 1 < 79) {
+					if ((length $line) + (length $c) + 1 < $width) {
 						$line .= $c . ' ';
 					} else {
 						$line =~ s/\s+$//;
@@ -251,7 +252,7 @@ sub config
 		if ($nref) {
 			my $c = $nref->user_call;
 			dbg("recursing from $call -> $c") if isdbg('routec');
-			my @rout = $nref->config($nodes_only, $level+1, $seen, @_);
+			my @rout = $nref->config($nodes_only, $width, $level+1, $seen, @_);
 			if (@rout && @_) {
 				push @out, ' ' x ($level*2) . $self->user_call unless grep /^\s+$call/, @out;
 			}
@@ -296,6 +297,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;
@@ -308,8 +311,11 @@ sub findroutes
 	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;
 		}
 	}