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,0));
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
use vars qw(%list %valid $filterdef);
%valid = (
dxcc => '0,Country Code',
itu => '0,ITU Zone',
cq => '0,CQ Zone',
+ state => '0,State',
+ city => '0,City',
+ lastseen => 'Last Seen,atime',
);
$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');
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 $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;
}
#
return $r ? 1 : 0;
}
-sub parents
-{
- my $self = shift;
- return @{$self->{parent}};
-}
-
#
# display routines
#
my $self = shift;
my @dxchan;
# dbg("Trying node $self->{call}") if isdbg('routech');
+
my $dxchan = DXChannel->get($self->{call});
push @dxchan, $dxchan if $dxchan;
# 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;
+
+ # 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) {
return $dxchan;
}
+sub _adddxchan
+{
+ my $self = shift;
+ return $self->_addlist('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
#
#
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;