X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=afce3a042d850200af3b9478d8e6b88cd8527403;hb=2f2b6dbde8a63949fc065dc96a9cb24224dcda7b;hp=abd3dcbb74ff5741da45efa13b60ce42b6204d5c;hpb=dce19df96e5dab964cd89cab9c33af470d824109;p=spider.git

diff --git a/perl/Route.pm b/perl/Route.pm
index abd3dcbb..afce3a04 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -1,32 +1,27 @@
 #!/usr/bin/perl
 #
 # This module impliments the abstracted routing for all protocols and
-# is probably what I SHOULD have done the first time. 
+# is probably what I SHOULD have done the first time.
 #
 # Heyho.
 #
-# This is just a container class which I expect to subclass 
+# This is just a container class which I expect to subclass
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
 # $Id$
-# 
+#
 
 package Route;
 
 use DXDebug;
 use DXChannel;
 use Prefix;
+use DXUtil;
 
 use strict;
 
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw(%list %valid $filterdef);
 
 %valid = (
@@ -40,7 +35,7 @@ use vars qw(%list %valid $filterdef);
 		 );
 
 $filterdef = bless ([
-			  # tag, sort, field, priv, special parser 
+			  # tag, sort, field, priv, special parser
 			  ['channel', 'c', 0],
 			  ['channel_dxcc', 'nc', 1],
 			  ['channel_itu', 'ni', 2],
@@ -72,8 +67,8 @@ sub new
 		Prefix::cty_data($call);
 
 	$self->{flags} = here(1);
-	
-	return $self; 
+
+	return $self;
 }
 
 #
@@ -90,7 +85,7 @@ sub _getcall
 	return $thingy;
 }
 
-# 
+#
 # add and delete a callsign to/from a list
 #
 
@@ -101,7 +96,7 @@ sub _addlist
 	my @out;
 	foreach my $c (@_) {
 		confess "Need a ref here" unless ref($c);
-		
+
 		my $call = $c->{call};
 		unless (grep $_ eq $call, @{$self->{$field}}) {
 			push @{$self->{$field}}, $call;
@@ -171,7 +166,7 @@ sub parents
 	return @{$self->{parent}};
 }
 
-# 
+#
 # display routines
 #
 
@@ -185,30 +180,36 @@ sub user_call
 sub config
 {
 	my $self = shift;
-	my $nodes_only = shift;
+	my $nodes_only = shift || 0;
 	my $level = shift;
 	my $seen = shift;
 	my @out;
 	my $line;
-	my $call = $self->user_call;
+	my $call = $self->{call};
 	my $printit = 1;
 
+	dbg("config: $call nodes: $nodes_only level: $level calls: " . join(',', @_)) if isdbg('routec');
+
 	# allow ranges
 	if (@_) {
 		$printit = grep $call =~ m|$_|, @_;
 	}
 
 	if ($printit) {
-		$line = ' ' x ($level*2) . "$call";
-		$call = ' ' x length $call; 
-		
+		my $pcall = $self->user_call;
+		$pcall .= ":" . $self->obscount if isdbg('obscount');
+
+
+		$line = ' ' x ($level*2) . "$pcall";
+		$pcall = ' ' x length $pcall;
+
 		# recursion detector
-		if ((DXChannel::get($self->{call}) && $level > 1) || grep $self->{call} eq $_, @$seen) {
+		if ((DXChannel::get($call) && $level > 1) || $seen->{$call}) {
 			$line .= ' ...';
 			push @out, $line;
 			return @out;
 		}
-		push @$seen, $self->{call};
+		$seen->{$call}++;
 
 		# print users
 		unless ($nodes_only) {
@@ -227,7 +228,7 @@ sub config
 					} else {
 						$line =~ s/\s+$//;
 						push @out, $line;
-						$line = ' ' x ($level*2) . "$call->$c ";
+						$line = ' ' x ($level*2) . "$pcall->$c ";
 					}
 				}
 			}
@@ -235,18 +236,28 @@ sub config
 		$line =~ s/->$//g;
 		$line =~ s/\s+$//;
 		push @out, $line if length $line;
+	} else {
+		# recursion detector
+		if ((DXChannel::get($call) && $level > 1) || $seen->{$call}) {
+			return @out;
+		}
+		$seen->{$call}++;
 	}
-	
+
 	# deal with more nodes
 	foreach my $ncall (sort @{$self->{nodes}}) {
 		my $nref = Route::Node::get($ncall);
 
 		if ($nref) {
 			my $c = $nref->user_call;
-#			dbg("recursing from $call -> $c") if isdbg('routec');
-			push @out, $nref->config($nodes_only, $level+1, $seen, @_);
+			dbg("recursing from $call -> $c") if isdbg('routec');
+			my @rout = $nref->config($nodes_only, $level+1, $seen, @_);
+			if (@rout && @_) {
+				push @out, ' ' x ($level*2) . $self->user_call unless grep /^\s+$call/, @out;
+			}
+			push @out, @rout;
 		} else {
-			push @out, ' ' x (($level+1)*2)  . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_); 
+			push @out, ' ' x (($level+1)*2)  . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_);
 		}
 	}
 
@@ -260,7 +271,7 @@ sub cluster
 	my $users = scalar DXCommandmode::get_all();
 	my $maxusers = Route::User::max();
 	my $uptime = main::uptime();
-	
+
 	return " $nodes nodes, $users local / $tot total users  Max users $maxusers  Uptime $uptime";
 }
 
@@ -283,8 +294,8 @@ sub alldxchan
 
 	my $dxchan = DXChannel::get($self->{call});
 	push @dxchan, $dxchan if $dxchan;
-	
-	# it isn't, build up a list of dxchannels and possible ping times 
+
+	# it isn't, build up a list of dxchannels and possible ping times
 	# for all the candidates.
 	unless (@dxchan) {
 		foreach my $p (@{$self->{parent}}) {
@@ -308,14 +319,14 @@ sub alldxchan
 sub dxchan
 {
 	my $self = shift;
-	
+
 	# ALWAYS return the locally connected channel if present;
 	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;
 	foreach my $dxc (@dxchan) {
@@ -339,14 +350,14 @@ sub DESTROY
 {
 	my $self = shift;
 	my $pkg = ref $self;
-	
+
 	dbg("$pkg $self->{call} destroyed") if isdbg('routelow');
 }
 
 no strict;
 #
-# return a list of valid elements 
-# 
+# return a list of valid elements
+#
 
 sub fields
 {
@@ -363,7 +374,7 @@ sub fields
 #
 
 sub field_prompt
-{ 
+{
 	my ($self, $ele) = @_;
 	my $pkg = ref $self;
     my $val = "${pkg}::valid";
@@ -379,7 +390,7 @@ sub AUTOLOAD
 	my $name = $AUTOLOAD;
 	return if $name =~ /::DESTROY$/;
 	$name =~ s/^.*:://o;
-  
+
 	confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
 
 	# this clever line of code creates a subroutine which takes over from autoload