remove warnings from $BRANCH lines for 5.8.0

[spider.git] / perl / Route.pm

diff --git a/perl/Route.pm b/perl/Route.pm
index 7276c6979fc7f08510cb1d2df8328dae7a470996..7112734f0741a756a2585bab4f91f84f64e98a4d 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;
 
@@ -40,13 +40,13 @@ use vars qw(%list %valid $filterdef);
 $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],
+                         ['call_dxcc', 'nc', 5],
+                         ['call_itu', 'ni', 6],
+                         ['call_zone', 'nz', 7],
                         ], 'Filter::Cmd');
 
 
@@ -274,6 +274,7 @@ 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;
        
@@ -301,12 +302,16 @@ sub alldxchan
 sub dxchan
 {
        my $self = shift;
+       
+       # ALWAYS return the locally connected channel if present;
+       my $dxchan = DXChannel->get($self->call);
+       return $dxchan if $dxchan;
+       
        my @dxchan = $self->alldxchan;
        return undef unless @dxchan;
        
        # determine the minimum ping channel
        my $minping = 99999999;
-       my $dxchan;
        foreach my $dxc (@dxchan) {
                my $p = $dxc->pingave;
                if (defined $p  && $p < $minping) {
@@ -318,6 +323,8 @@ sub dxchan
        return $dxchan;
 }
 
+
+
 #
 # track destruction
 #