projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a pretty nearly working gtkconsole...
[spider.git]
/
perl
/
Route.pm
diff --git
a/perl/Route.pm
b/perl/Route.pm
index 7276c6979fc7f08510cb1d2df8328dae7a470996..582434415073033e2ba22aed70c625b2e2c8e3b1 100644
(file)
--- a/
perl/Route.pm
+++ b/
perl/Route.pm
@@
-22,10
+22,8
@@
use strict;
use vars qw($VERSION $BRANCH);
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;
+
+main::mkver($VERSION = q$Revision$);
use vars qw(%list %valid $filterdef);
use vars qw(%list %valid $filterdef);
@@
-35,37
+33,46
@@
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',
+ aranea => '0, By Aranea,yesno',
);
$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');
sub new
{
], 'Filter::Cmd');
sub new
{
- my ($pkg, $call) = @_;
+ my $pkg = shift;
+ my $call = shift;
+
$pkg = ref $pkg if ref $pkg;
my $self = bless {call => $call}, $pkg;
dbg("create $pkg with $call") if isdbg('routelow');
# add in all the dxcc, itu, zone info
$pkg = ref $pkg if ref $pkg;
my $self = bless {call => $call}, $pkg;
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->{flags} = here(1);
+ ($self->{dxcc}, $self->{itu}, $self->{cq}, $self->{state}, $self->{city}) =
+ Prefix::cty_data($call);
+
+ $self->{flags} = 1;
return $self;
}
return $self;
}
@@
-123,6
+130,16
@@
sub _dellist
return @out;
}
return @out;
}
+sub _haslist
+{
+ my $self = shift;
+ my $field = shift;
+ my @out;
+ my $call = shift;
+ my $r = grep $_->{call} eq $call, @{$self->{$field}};
+ dbg(ref($self) . " $call is " . $r?'in':'NOT in' . " $self->{call}\->\{$field\}") if isdbg('routelow');
+}
+
sub is_empty
{
my $self = shift;
sub is_empty
{
my $self = shift;
@@
-135,28
+152,24
@@
sub is_empty
# These can be called in various ways:-
#
# Route::here or $ref->here returns 1 or 0 depending on value of the here flag
# 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
#
# $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
{
my $self = shift;
sub here
{
my $self = shift;
- 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));
- return $r ? 1 : 0;
+ $self->{flags} = shift if @_;
+ return $self->{flags};
}
}
+# conferencing in the ak1a sense is not supported
sub conf
{
my $self = shift;
sub conf
{
my $self = shift;
- 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));
- return $r ? 1 : 0;
+ return 0;
}
sub parents
}
sub parents
@@
-197,9
+210,9
@@
sub config
$call = ' ' x length $call;
# recursion detector
$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 .= ' ...';
$line .= ' ...';
-
push @out, $line;
+
#
push @out, $line;
return @out;
}
push @$seen, $self->{call};
return @out;
}
push @$seen, $self->{call};
@@
-274,7
+287,8
@@
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});
+
+ my $dxchan = DXChannel::get($self->{call});
push @dxchan, $dxchan if $dxchan;
# it isn't, build up a list of dxchannels and possible ping times
push @dxchan, $dxchan if $dxchan;
# it isn't, build up a list of dxchannels and possible ping times
@@
-283,7
+297,7
@@
sub alldxchan
foreach my $p (@{$self->{parent}}) {
# dbg("Trying parent $p") if isdbg('routech');
next if $p eq $main::mycall; # the root
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 {
if ($dxchan) {
push @dxchan, $dxchan unless grep $dxchan == $_, @dxchan;
} else {
@@
-301,12
+315,16
@@
sub alldxchan
sub dxchan
{
my $self = shift;
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 = $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) {
foreach my $dxc (@dxchan) {
my $p = $dxc->pingave;
if (defined $p && $p < $minping) {
@@
-318,6
+336,8
@@
sub dxchan
return $dxchan;
}
return $dxchan;
}
+
+
#
# track destruction
#
#
# track destruction
#
@@
-362,17
+382,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;