X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=0f52e39b4023285ad994ad533feb18d66ad11f19;hb=b463dee2efa3edb72fab9bf1c64364ea38408bec;hp=7112734f0741a756a2585bab4f91f84f64e98a4d;hpb=dbf7523a9b228dbdf1d03109afde351b8b194fab;p=spider.git

diff --git a/perl/Route.pm b/perl/Route.pm
index 7112734f..0f52e39b 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -35,6 +35,8 @@ use vars qw(%list %valid $filterdef);
 		  dxcc => '0,Country Code',
 		  itu => '0,ITU Zone',
 		  cq => '0,CQ Zone',
+		  state => '0,State',
+		  city => '0,City',
 		 );
 
 $filterdef = bless ([
@@ -44,9 +46,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 +68,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; 
@@ -369,17 +375,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;