X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=6263190043f60f2f6317c8634466bf625e6acf10;hb=14cb55073f64836f3f2a1aaf3a86207dec4fa103;hp=a1b9f00476228ac03e99b89480050c68c1741f60;hpb=6ccc3a6e864a2fee18786a7070400c7c4f22cf7c;p=spider.git

diff --git a/perl/Route.pm b/perl/Route.pm
index a1b9f004..62631900 100644
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -22,10 +22,8 @@ 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;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 use vars qw(%list %valid $filterdef);
 
@@ -35,6 +33,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 +44,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 +66,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; 
@@ -135,9 +139,11 @@ sub is_empty
 # These can be called in various ways:-
 #
 # Route::here or $ref->here returns 1 or 0 depending on value of the here flag
-# Route::here(1) returns 2 (the bit value of the here flag)
+# Route::here(1) returns 1 (the bit value of the here flag)
 # $ref->here(1) or $ref->here(0) sets the here flag
 #
+# these are now redundant really as we are not interested in conferences
+# and here is back to being '1'.
 
 sub here
 {
@@ -145,7 +151,7 @@ sub here
 	my $r = shift;
 	return $self ? 2 : 0 unless ref $self;
 	return ($self->{flags} & 2) ? 1 : 0 unless defined $r;
-	$self->{flags} = (($self->{flags} & ~2) | ($r ? 2 : 0));
+	$self->{flags} = (($self->{flags} & ~1) | ($r ? 1 : 0));
 	return $r ? 1 : 0;
 }
 
@@ -153,10 +159,10 @@ sub conf
 {
 	my $self = shift;
 	my $r = shift;
-	return $self ? 1 : 0 unless ref $self;
+	return $self ? 2 : 0 unless ref $self;
 	return ($self->{flags} & 1) ? 1 : 0 unless defined $r;
-	$self->{flags} = (($self->{flags} & ~1) | ($r ? 1 : 0));
-	return $r ? 1 : 0;
+	$self->{flags} = (($self->{flags} & ~2) | ($r ? 2 : 0));
+	return $r ? 2 : 0;
 }
 
 sub parents
@@ -323,6 +329,8 @@ sub dxchan
 	return $dxchan;
 }
 
+
+
 #
 # track destruction
 #
@@ -367,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;