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;
dxcc => '0,Country Code',
itu => '0,ITU Zone',
cq => '0,CQ Zone',
+ state => '0,State',
+ city => '0,City',
+ lastseen => 'Last Seen,atime',
);
$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');
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;
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;
}
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
#
# 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');
+ foreach my $p (@{$self->{dxchan}}) {
+# dbg("Trying dxchan $p") if isdbg('routech');
next if $p eq $main::mycall; # the root
my $dxchan = DXChannel->get($p);
if ($dxchan) {
return @dxchan;
}
-sub dxchan
+sub bestdxchan
{
my $self = shift;
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;
}
#
#
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;