now working to 1st order OK with two nodes.

[spider.git] / perl / Route.pm

diff --git a/perl/Route.pm b/perl/Route.pm
index 16ee88cb52b76b92af3f45f035cf26616a560751..7858e16ce7500dcce1864b07e2ba4f857cd1cd77 100644 (file)
--- 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 => '0,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; 
@@ -145,7 +152,8 @@ 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} &= ~2;
+       $self->{flags} |= $r ? 2 : 0;
        return $r ? 1 : 0;
 }
 
@@ -155,16 +163,11 @@ sub conf
        my $r = shift;
        return $self ? 1 : 0 unless ref $self;
        return ($self->{flags} & 1) ? 1 : 0 unless defined $r;
-       $self->{flags} = (($self->{flags} & ~1) | ($r ? 1 : 0));
+       $self->{flags} &= ~1;
+       $self->{flags} |= $r ? 1 : 0;
        return $r ? 1 : 0;
 }
 
-sub parents
-{
-       my $self = shift;
-       return @{$self->{parent}};
-}
-
 # 
 # display routines
 #
@@ -198,8 +201,8 @@ sub config
                
                # recursion detector
                if ((DXChannel->get($self->{call}) && $level > 1) || grep $self->{call} eq $_, @$seen) {
-                       $line .= ' ...';
-                       push @out, $line;
+#                      $line .= ' ...';
+#                      push @out, $line;
                        return @out;
                }
                push @$seen, $self->{call};
@@ -268,21 +271,36 @@ sub get
        return Route::Node::get($call) || Route::User::get($call);
 }
 
+sub get_all
+{
+       return (Route::Node::get_all(), Route::User::get_all());
+}
+
 # find all the possible dxchannels which this object might be on
 sub alldxchan
 {
        my $self = shift;
-       my @dxchan;
-#      dbg("Trying node $self->{call}") if isdbg('routech');
 
        my $dxchan = DXChannel->get($self->{call});
-       push @dxchan, $dxchan if $dxchan;
+       if ($dxchan) {
+               dbg("alldxchan for $self->{call} = $dxchan->{call}") if isdbg('routelow');
+               return $dxchan if $dxchan;
+       }
+       
+       my @nodes;
+       if ($self->isa('Route::User')) {
+               push @nodes, map{Route::Node::get($_)} @{$self->{nodes}};
+       } elsif ($self->isa('Route::Node')) {
+               push @nodes, $self;
+       }
        
        # 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');
+       my @dxchan;
+       foreach my $nref (@nodes) {
+               next unless $nref;
+               foreach my $p (@{$nref->{dxchan}}) {
+#                      dbg("Trying dxchan $p") if isdbg('routech');
                        next if $p eq $main::mycall; # the root
                        my $dxchan = DXChannel->get($p);
                        if ($dxchan) {
@@ -295,11 +313,11 @@ sub alldxchan
                        }
                }
        }
-#      dbg('routech', "Got dxchan: " . join(',', (map{ $_->call } @dxchan)) );
+       dbg("alldxchan for $self->{call} = (" . join(',', @dxchan) . ")") if isdbg('routelow');
        return @dxchan;
 }
 
-sub dxchan
+sub bestdxchan
 {
        my $self = shift;
        
@@ -307,24 +325,12 @@ sub dxchan
        my $dxchan = DXChannel->get($self->call);
        return $dxchan if $dxchan;
        
-       my @dxchan = $self->alldxchan;
+       my @dxchan = sort { ($a->pingave || 9999999) <=> ($b->pingave || 9999999) } $self->alldxchan;
        return undef unless @dxchan;
        
-       # determine the minimum ping channel
-       my $minping = 99999999;
-       foreach my $dxc (@dxchan) {
-               my $p = $dxc->pingave;
-               if (defined $p  && $p < $minping) {
-                       $minping = $p;
-                       $dxchan = $dxc;
-               }
-       }
-       $dxchan = shift @dxchan unless $dxchan;
-       return $dxchan;
+       return shift @dxchan;
 }
 
-
-
 #
 # track destruction
 #
@@ -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;