get it right!

[spider.git] / perl / Route.pm

diff --git a/perl/Route.pm b/perl/Route.pm
index ee84c1508b3bdd47e07edad8597845760a34ac19..9e887635e8d470b13f17deb81978bdc3e85db352 100644 (file)
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -17,15 +17,13 @@ package Route;
 use DXDebug;
 use DXChannel;
 use Prefix;
+use DXUtil;
 
 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;
+($VERSION, $BRANCH) = dxver(q$Revision$);
 
 use vars qw(%list %valid $filterdef);
 
@@ -35,18 +33,27 @@ 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 ([
                          # tag, sort, field, priv, special parser 
                          ['channel', 'c', 0],
-                         ['channel_dxcc', 'n', 1],
-                         ['channel_itu', 'n', 2],
-                         ['channel_zone', 'n', 3],
+                         ['channel_dxcc', 'nc', 1],
+                         ['channel_itu', 'ni', 2],
+                         ['channel_zone', 'nz', 3],
                          ['call', 'c', 4],
-                         ['call_dxcc', 'n', 5],
-                         ['call_itu', 'n', 6],
-                         ['call_zone', 'n', 7],
+                         ['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; 
@@ -193,11 +197,13 @@ sub config
        }
 
        if ($printit) {
-               $line = ' ' x ($level*2) . "$call";
-               $call = ' ' x length $call; 
+               my $pcall = "$call:" . $self->obscount;
+               
+               $line = ' ' x ($level*2) . "$pcall";
+               $call = ' ' x length $pcall; 
                
                # recursion detector
-               if ((DXChannel->get($self->{call}) && $level > 1) || grep $self->{call} eq $_, @$seen) {
+               if ((DXChannel::get($self->{call}) && $level > 1) || grep $self->{call} eq $_, @$seen) {
                        $line .= ' ...';
                        push @out, $line;
                        return @out;
@@ -275,7 +281,7 @@ sub alldxchan
        my @dxchan;
 #      dbg("Trying node $self->{call}") if isdbg('routech');
 
-       my $dxchan = DXChannel->get($self->{call});
+       my $dxchan = DXChannel::get($self->{call});
        push @dxchan, $dxchan if $dxchan;
        
        # it isn't, build up a list of dxchannels and possible ping times 
@@ -284,7 +290,7 @@ sub alldxchan
                foreach my $p (@{$self->{parent}}) {
 #                      dbg("Trying parent $p") if isdbg('routech');
                        next if $p eq $main::mycall; # the root
-                       my $dxchan = DXChannel->get($p);
+                       my $dxchan = DXChannel::get($p);
                        if ($dxchan) {
                                push @dxchan, $dxchan unless grep $dxchan == $_, @dxchan;
                        } else {
@@ -304,7 +310,7 @@ sub dxchan
        my $self = shift;
        
        # ALWAYS return the locally connected channel if present;
-       my $dxchan = DXChannel->get($self->call);
+       my $dxchan = DXChannel::get($self->call);
        return $dxchan if $dxchan;
        
        my @dxchan = $self->alldxchan;
@@ -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;