X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=0e9b61395da39891f3bcf0a1957e7a6e8abdd87a;hb=598233c22daef138cd7b0a653d3165b4a16905e2;hp=a1b9f00476228ac03e99b89480050c68c1741f60;hpb=6ccc3a6e864a2fee18786a7070400c7c4f22cf7c;p=spider.git

diff --git a/perl/Route.pm b/perl/Route.pm
index a1b9f004..0e9b6139 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -23,7 +23,7 @@ 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;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -35,6 +35,9 @@ use vars qw(%list %valid $filterdef);
 		  dxcc => '0,Country Code',
 		  itu => '0,ITU Zone',
 		  cq => '0,CQ Zone',
+		  state => '0,State',
+		  city => '0,City',
+		  lastseen => 'Last Seen,atime',
 		 );
 
 $filterdef = bless ([
@@ -44,9 +47,16 @@ $filterdef = bless ([
 			  ['channel_itu', 'ni', 2],
 			  ['channel_zone', 'nz', 3],
 			  ['call', 'c', 4],
+			  ['by', 'c', 4],
 			  ['call_dxcc', 'nc', 5],
+			  ['by_dxcc', 'nc', 5],
 			  ['call_itu', 'ni', 6],
+			  ['by_itu', 'ni', 6],
 			  ['call_zone', 'nz', 7],
+			  ['by_zone', 'nz', 7],
+			  ['channel_state', 'ns', 8],
+			  ['call_state', 'ns', 9],
+			  ['by_state', 'ns', 9],
 			 ], 'Filter::Cmd');
 
 
@@ -59,12 +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->{dxcc}, $self->{itu}, $self->{cq}, $self->{state}, $self->{city}) =
+		Prefix::cty_data($call);
+
 	$self->{flags} = here(1);
 	
 	return $self; 
@@ -159,12 +166,6 @@ sub conf
 	return $r ? 1 : 0;
 }
 
-sub parents
-{
-	my $self = shift;
-	return @{$self->{parent}};
-}
-
 # 
 # display routines
 #
@@ -281,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) {
@@ -299,7 +300,7 @@ sub alldxchan
 	return @dxchan;
 }
 
-sub dxchan
+sub bestdxchan
 {
 	my $self = shift;
 	
@@ -323,6 +324,31 @@ sub dxchan
 	return $dxchan;
 }
 
+sub _adddxchan
+{
+	my $self = shift;
+    return $self->_addlist('dxchan', @_);
+}
+
+sub _deldxchan
+{
+	my $self = shift;
+    return $self->_dellist('dxchan', @_);
+}
+
+sub _addnode
+{
+	my $self = shift;
+    return $self->_addlist('nodes', @_);
+}
+
+sub _delnode
+{
+	my $self = shift;
+    return $self->_dellist('nodes', @_);
+}
+
+
 #
 # track destruction
 #
@@ -367,17 +393,18 @@ sub field_prompt
 #
 sub AUTOLOAD
 {
-	my $self = shift;
+	no strict;
 	my $name = $AUTOLOAD;
 	return if $name =~ /::DESTROY$/;
-	$name =~ s/.*:://o;
+	$name =~ s/^.*:://o;
   
 	confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
 
 	# 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}} ;
-    @_ ? $self->{$name} = shift : $self->{$name} ;
+	*{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
+       goto &$AUTOLOAD;
+
 }
 
 1;