got investigate and auto believe essentially working

[spider.git] / perl / Route.pm

diff --git a/perl/Route.pm b/perl/Route.pm
index 0e9b61395da39891f3bcf0a1957e7a6e8abdd87a..7858e16ce7500dcce1864b07e2ba4f857cd1cd77 100644 (file)
--- a/perl/Route.pm
+++ b/perl/Route.pm
@@ -37,7 +37,7 @@ use vars qw(%list %valid $filterdef);
                  cq => '0,CQ Zone',
                  state => '0,State',
                  city => '0,City',
-                 lastseen => 'Last Seen,atime',
+                 lastseen => '0,Last Seen,atime',
                 );
 
 $filterdef = bless ([
@@ -152,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;
 }
 
@@ -162,7 +163,8 @@ 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;
 }
 
@@ -199,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};
@@ -269,20 +271,35 @@ 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->{dxchan}}) {
+       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);
@@ -296,7 +313,7 @@ sub alldxchan
                        }
                }
        }
-#      dbg('routech', "Got dxchan: " . join(',', (map{ $_->call } @dxchan)) );
+       dbg("alldxchan for $self->{call} = (" . join(',', @dxchan) . ")") if isdbg('routelow');
        return @dxchan;
 }
 
@@ -308,47 +325,12 @@ sub bestdxchan
        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;
-}
-
-sub _adddxchan
-{
-       my $self = shift;
-    return $self->_addlist('dxchan', @_);
+       return shift @dxchan;
 }
 
-sub _deldxchan
-{
-       my $self = shift;
-    return $self->_dellist('dxchan', @_);
-}
-
-sub _addnode
-{
-       my $self = shift;
-    return $self->_addlist('nodes', @_);
-}
-
-sub _delnode
-{
-       my $self = shift;
-    return $self->_dellist('nodes', @_);
-}
-
-
 #
 # track destruction
 #