projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more wip and a nearly working basic thing
[spider.git]
/
perl
/
Route.pm
diff --git
a/perl/Route.pm
b/perl/Route.pm
index 6a4f96f60c6f9101e7dd6cae66f0b8d42b7ce1ee..45bd7213e147eceb93bf3458f294b2dbd0b67a1c 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+)/ );
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;
$main::build += $VERSION;
$main::branch += $BRANCH;
@@
-35,18
+35,28
@@
use vars qw(%list %valid $filterdef);
dxcc => '0,Country Code',
itu => '0,ITU Zone',
cq => '0,CQ Zone',
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],
);
$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', 'n
c
', 1],
+ ['channel_itu', 'n
i
', 2],
+ ['channel_zone', 'n
z
', 3],
['call', 'c', 4],
['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');
], 'Filter::Cmd');
@@
-59,12
+69,9
@@
sub new
dbg("create $pkg with $call") if isdbg('routelow');
# add in all the dxcc, itu, zone info
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;
$self->{flags} = here(1);
return $self;
@@
-92,28
+99,41
@@
sub _addlist
{
my $self = shift;
my $field = shift;
{
my $self = shift;
my $field = shift;
+ my @out;
foreach my $c (@_) {
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 @{$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;
}
sub _dellist
{
my $self = shift;
my $field = shift;
+ my @out;
foreach my $c (@_) {
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');
$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;
}
#
}
#
@@
-132,7
+152,8
@@
sub here
my $r = shift;
return $self ? 2 : 0 unless ref $self;
return ($self->{flags} & 2) ? 1 : 0 unless defined $r;
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;
}
return $r ? 1 : 0;
}
@@
-142,16
+163,11
@@
sub conf
my $r = shift;
return $self ? 1 : 0 unless ref $self;
return ($self->{flags} & 1) ? 1 : 0 unless defined $r;
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;
}
return $r ? 1 : 0;
}
-sub parents
-{
- my $self = shift;
- return @{$self->{parent}};
-}
-
#
# display routines
#
#
# display routines
#
@@
-261,14
+277,15
@@
sub alldxchan
my $self = shift;
my @dxchan;
# dbg("Trying node $self->{call}") if isdbg('routech');
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) {
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) {
next if $p eq $main::mycall; # the root
my $dxchan = DXChannel->get($p);
if ($dxchan) {
@@
-285,24
+302,18
@@
sub alldxchan
return @dxchan;
}
return @dxchan;
}
-sub dxchan
+sub
best
dxchan
{
my $self = shift;
{
my $self = shift;
- my @dxchan = $self->alldxchan;
+
+ # ALWAYS return the locally connected channel if present;
+ my $dxchan = DXChannel->get($self->call);
+ return $dxchan if $dxchan;
+
+ my @dxchan = sort { ($a->pingave || 9999999) <=> ($b->pingave || 9999999) } $self->alldxchan;
return undef unless @dxchan;
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) {
- $minping = $p;
- $dxchan = $dxc;
- }
- }
- $dxchan = shift @dxchan unless $dxchan;
- return $dxchan;
+ return shift @dxchan;
}
#
}
#
@@
-349,17
+360,18
@@
sub field_prompt
#
sub AUTOLOAD
{
#
sub AUTOLOAD
{
-
my $self = shif
t;
+
no stric
t;
my $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
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
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;
}
1;