X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=5f9de7d72a823db72b50d20791362638e6454e02;hb=c3c15883cf25add24fc49e32eb0d17dce6839a62;hp=61d07249917a889028eba36f8f9c694e8ad9a0ab;hpb=6624dcdf07d628e8d6a16fc6549edf40be25b7b2;p=spider.git diff --git a/perl/Route.pm b/perl/Route.pm index 61d07249..5f9de7d7 100644 --- a/perl/Route.pm +++ b/perl/Route.pm @@ -20,6 +20,11 @@ use Prefix; use strict; + +use vars qw($VERSION $BRANCH); + +main::mkver($VERSION = q$Revision$); + use vars qw(%list %valid $filterdef); %valid = ( @@ -28,18 +33,28 @@ use vars qw(%list %valid $filterdef); dxcc => '0,Country Code', itu => '0,ITU Zone', cq => '0,CQ Zone', + state => '0,State', + city => '0,City', + aranea => '0, By Aranea,yesno', ); $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'); @@ -52,12 +67,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; @@ -85,28 +97,48 @@ sub _addlist { my $self = shift; my $field = shift; + my @out; foreach my $c (@_) { - my $call = _getcall($c); - unless (grep {$_ eq $call} @{$self->{$field}}) { + confess "Need a ref here" unless ref($c); + + my $call = $c->{call}; + unless (grep $_ eq $call, @{$self->{$field}}) { push @{$self->{$field}}, $call; dbg(ref($self) . " adding $call to " . $self->{call} . "->\{$field\}") if isdbg('routelow'); + push @out, $c; } } - return $self->{$field}; + return @out; } sub _dellist { my $self = shift; my $field = shift; + my @out; foreach my $c (@_) { - my $call = _getcall($c); - if (grep {$_ eq $call} @{$self->{$field}}) { + confess "Need a ref here" unless ref($c); + my $call = $c->{call}; + if (grep $_ eq $call, @{$self->{$field}}) { $self->{$field} = [ grep {$_ ne $call} @{$self->{$field}} ]; dbg(ref($self) . " deleting $call from " . $self->{call} . "->\{$field\}") if isdbg('routelow'); + push @out, $c; } } - return $self->{$field}; + return @out; +} + +sub is_empty +{ + my $self = shift; + return @{$self->{$_[0]}} == 0; +} + +sub is_aranea +{ + my $self = shift; + $self->{aranea} = shift if @_; + return $self->{aranea}; } # @@ -115,9 +147,11 @@ sub _dellist # These can be called in various ways:- # # Route::here or $ref->here returns 1 or 0 depending on value of the here flag -# Route::here(1) returns 2 (the bit value of the here flag) +# Route::here(1) returns 1 (the bit value of the here flag) # $ref->here(1) or $ref->here(0) sets the here flag # +# these are now redundant really as we are not interested in conferences +# and here is back to being '1'. sub here { @@ -125,7 +159,7 @@ 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} = (($self->{flags} & ~1) | ($r ? 1 : 0)); return $r ? 1 : 0; } @@ -133,10 +167,10 @@ sub conf { my $self = shift; my $r = shift; - return $self ? 1 : 0 unless ref $self; + return $self ? 2 : 0 unless ref $self; return ($self->{flags} & 1) ? 1 : 0 unless defined $r; - $self->{flags} = (($self->{flags} & ~1) | ($r ? 1 : 0)); - return $r ? 1 : 0; + $self->{flags} = (($self->{flags} & ~2) | ($r ? 2 : 0)); + return $r ? 2 : 0; } sub parents @@ -177,7 +211,7 @@ sub config $call = ' ' x length $call; # 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; @@ -254,7 +288,8 @@ sub alldxchan my $self = shift; 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 @@ -263,7 +298,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 { @@ -281,12 +316,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) { @@ -298,6 +337,8 @@ sub dxchan return $dxchan; } + + # # track destruction # @@ -342,17 +383,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;