X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=387407669583ff325644bbc51d9517d1fc215de6;hb=8178d787d7cc8040fa8958197582bba5c80e6f59;hp=7112734f0741a756a2585bab4f91f84f64e98a4d;hpb=d0e554d25adfe94a2d5a1c3f57b48bfab1a9f4a2;p=spider.git diff --git a/perl/Route.pm b/perl/Route.pm index 7112734f..38740766 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'); @@ -63,7 +72,9 @@ sub new if (@dxcc > 0) { $self->{dxcc} = $dxcc[1]->dxcc; $self->{itu} = $dxcc[1]->itu; - $self->{cq} = $dxcc[1]->cq; + $self->{cq} = $dxcc[1]->cq; + $self->{state} = $dxcc[1]->state; + $self->{city} = $dxcc[1]->city; } $self->{flags} = here(1); @@ -370,16 +381,19 @@ 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}}; + &$AUTOLOAD($self, @_); + +# @_ ? $self->{$name} = shift : $self->{$name} ; } 1;