X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute.pm;h=cf4eb198e9d664746fb8920717571ceffee79f27;hb=23f64142e2cddaff37c14efd3140a6f7f41cb84a;hp=a1b9f00476228ac03e99b89480050c68c1741f60;hpb=6ccc3a6e864a2fee18786a7070400c7c4f22cf7c;p=spider.git diff --git a/perl/Route.pm b/perl/Route.pm index a1b9f004..cf4eb198 100644 --- a/perl/Route.pm +++ b/perl/Route.pm @@ -1,32 +1,27 @@ #!/usr/bin/perl # # This module impliments the abstracted routing for all protocols and -# is probably what I SHOULD have done the first time. +# is probably what I SHOULD have done the first time. # # Heyho. # -# This is just a container class which I expect to subclass +# This is just a container class which I expect to subclass # # Copyright (c) 2001 Dirk Koopman G1TLH # # $Id$ -# +# 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; - use vars qw(%list %valid $filterdef); %valid = ( @@ -35,18 +30,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 + # tag, sort, field, priv, special parser ['channel', 'c', 0], ['channel_dxcc', 'nc', 1], ['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,15 +63,12 @@ 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; + + return $self; } # @@ -84,7 +85,7 @@ sub _getcall return $thingy; } -# +# # add and delete a callsign to/from a list # @@ -95,7 +96,7 @@ sub _addlist my @out; foreach my $c (@_) { confess "Need a ref here" unless ref($c); - + my $call = $c->{call}; unless (grep $_ eq $call, @{$self->{$field}}) { push @{$self->{$field}}, $call; @@ -165,7 +166,7 @@ sub parents return @{$self->{parent}}; } -# +# # display routines # @@ -193,11 +194,15 @@ sub config } if ($printit) { - $line = ' ' x ($level*2) . "$call"; - $call = ' ' x length $call; - + my $pcall = $call; + $pcall .= ":" . $self->obscount if $self->via_pc92; + + + $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; @@ -230,7 +235,7 @@ sub config $line =~ s/\s+$//; push @out, $line if length $line; } - + # deal with more nodes foreach my $ncall (sort @{$self->{nodes}}) { my $nref = Route::Node::get($ncall); @@ -240,7 +245,7 @@ sub config # dbg("recursing from $call -> $c") if isdbg('routec'); push @out, $nref->config($nodes_only, $level+1, $seen, @_); } else { - push @out, ' ' x (($level+1)*2) . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_); + push @out, ' ' x (($level+1)*2) . "$ncall?" if @_ == 0 || (@_ && grep $ncall =~ m|$_|, @_); } } @@ -254,7 +259,7 @@ sub cluster my $users = scalar DXCommandmode::get_all(); my $maxusers = Route::User::max(); my $uptime = main::uptime(); - + return " $nodes nodes, $users local / $tot total users Max users $maxusers Uptime $uptime"; } @@ -275,16 +280,16 @@ 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 + + # 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'); 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 { @@ -302,14 +307,14 @@ sub alldxchan 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; return undef unless @dxchan; - + # determine the minimum ping channel my $minping = 99999999; foreach my $dxc (@dxchan) { @@ -323,6 +328,8 @@ sub dxchan return $dxchan; } + + # # track destruction # @@ -331,14 +338,14 @@ sub DESTROY { my $self = shift; my $pkg = ref $self; - + dbg("$pkg $self->{call} destroyed") if isdbg('routelow'); } no strict; # -# return a list of valid elements -# +# return a list of valid elements +# sub fields { @@ -355,7 +362,7 @@ sub fields # sub field_prompt -{ +{ my ($self, $ele) = @_; my $pkg = ref $self; my $val = "${pkg}::valid"; @@ -367,17 +374,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;