X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=388aed2e15056e0853c1a7f7dd538d83909ce501;hb=05a7fdd4a58c51e21b55b0509b054b625839290c;hp=387407669583ff325644bbc51d9517d1fc215de6;hpb=8178d787d7cc8040fa8958197582bba5c80e6f59;p=spider.git

diff --git a/perl/Route.pm b/perl/Route.pm
index 38740766..388aed2e 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -37,6 +37,7 @@ use vars qw(%list %valid $filterdef);
 		  cq => '0,CQ Zone',
 		  state => '0,State',
 		  city => '0,City',
+		  lastseen => 'Last Seen,atime',
 		 );
 
 $filterdef = bless ([
@@ -68,14 +69,9 @@ sub new
 	dbg("create $pkg with $call") if isdbg('routelow');
 
 	# add in all the dxcc, itu, zone info
-	my @dxcc = Prefix::extract($call);
-	if (@dxcc > 0) {
-		$self->{dxcc} = $dxcc[1]->dxcc;
-		$self->{itu} = $dxcc[1]->itu;
-		$self->{cq} = $dxcc[1]->cq;
-		$self->{state} = $dxcc[1]->state;
-		$self->{city} = $dxcc[1]->city;
-	}
+	($self->{dxcc}, $self->{itu}, $self->{cq}, $self->{state}, $self->{city}) =
+		Prefix::cty_data($call);
+
 	$self->{flags} = here(1);
 	
 	return $self; 
@@ -170,12 +166,6 @@ sub conf
 	return $r ? 1 : 0;
 }
 
-sub parents
-{
-	my $self = shift;
-	return @{$self->{parent}};
-}
-
 # 
 # display routines
 #
@@ -292,8 +282,8 @@ sub alldxchan
 	# it isn't, build up a list of dxchannels and possible ping times 
 	# for all the candidates.
 	unless (@dxchan) {
-		foreach my $p (@{$self->{parent}}) {
-#			dbg("Trying parent $p") if isdbg('routech');
+		foreach my $p (@{$self->{dxchan}}) {
+#			dbg("Trying dxchan $p") if isdbg('routech');
 			next if $p eq $main::mycall; # the root
 			my $dxchan = DXChannel->get($p);
 			if ($dxchan) {
@@ -310,7 +300,7 @@ sub alldxchan
 	return @dxchan;
 }
 
-sub dxchan
+sub bestdxchan
 {
 	my $self = shift;
 	
@@ -318,24 +308,12 @@ sub dxchan
 	my $dxchan = DXChannel->get($self->call);
 	return $dxchan if $dxchan;
 	
-	my @dxchan = $self->alldxchan;
+	my @dxchan = sort { ($a->pingave || 9999999) <=> ($b->pingave || 9999999) } $self->alldxchan;
 	return undef unless @dxchan;
 	
-	# determine the minimum ping channel
-	my $minping = 99999999;
-	foreach my $dxc (@dxchan) {
-		my $p = $dxc->pingave;
-		if (defined $p  && $p < $minping) {
-			$minping = $p;
-			$dxchan = $dxc;
-		}
-	}
-	$dxchan = shift @dxchan unless $dxchan;
-	return $dxchan;
+	return shift @dxchan;
 }
 
-
-
 #
 # track destruction
 #
@@ -380,7 +358,6 @@ sub field_prompt
 #
 sub AUTOLOAD
 {
-	my $self = shift;
 	no strict;
 	my $name = $AUTOLOAD;
 	return if $name =~ /::DESTROY$/;
@@ -390,10 +367,9 @@ sub AUTOLOAD
 
 	# this clever line of code creates a subroutine which takes over from autoload
 	# from OO Perl - Conway
-	*$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
-	&$AUTOLOAD($self, @_);
+	*{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
+       goto &$AUTOLOAD;
 
-#    @_ ? $self->{$name} = shift : $self->{$name} ;
 }
 
 1;