projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip
[spider.git]
/
perl
/
Route
/
Node.pm
diff --git
a/perl/Route/Node.pm
b/perl/Route/Node.pm
index 08b74c737295b15006a959e431a0eaa34b19fd42..92ceba22577940c41cbba51faa732bd29834d1ef 100644
(file)
--- a/
perl/Route/Node.pm
+++ b/
perl/Route/Node.pm
@@
-16,7
+16,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;
@@
-24,11
+24,13
@@
use vars qw(%list %valid @ISA $max $filterdef);
@ISA = qw(Route);
%valid = (
@ISA = qw(Route);
%valid = (
-
parent => '0,Parent Call
s,parray',
+
dxchan => '0,Visible on DXChan
s,parray',
nodes => '0,Nodes,parray',
users => '0,Users,parray',
usercount => '0,User Count',
version => '0,Version',
nodes => '0,Nodes,parray',
users => '0,Users,parray',
usercount => '0,User Count',
version => '0,Version',
+ np => '0,Using New Prot,yesno',
+ lid => '0,Last Msgid',
);
$filterdef = $Route::filterdef;
);
$filterdef = $Route::filterdef;
@@
-57,22
+59,22
@@
sub max
# object with that callsign. The upper layers are expected to do something
# sensible with this!
#
# object with that callsign. The upper layers are expected to do something
# sensible with this!
#
-# called as $
parent
->add(call, dxchan, version, flags)
+# called as $
dxchan
->add(call, dxchan, version, flags)
#
sub add
{
#
sub add
{
- my $
parent
= shift;
+ my $
dxchan
= shift;
my $call = uc shift;
my $call = uc shift;
- confess "Route::add trying to add $call to myself" if $call eq $
parent
->{call};
+ confess "Route::add trying to add $call to myself" if $call eq $
dxchan
->{call};
my $self = get($call);
if ($self) {
my $self = get($call);
if ($self) {
- $self->_add
parent($parent
);
- $
parent
->_addnode($self);
+ $self->_add
dxchan($dxchan
);
+ $
dxchan
->_addnode($self);
return undef;
}
return undef;
}
- $self = $
parent
->new($call, @_);
- $
parent
->_addnode($self);
+ $self = $
dxchan
->new($call, @_);
+ $
dxchan
->_addnode($self);
return $self;
}
return $self;
}
@@
-88,14
+90,14
@@
sub del
my $self = shift;
my $pref = shift;
my $self = shift;
my $pref = shift;
- # delete
parent from this call's parent
list
+ # delete
dxchan from this call's dxchan
list
$pref->_delnode($self);
$pref->_delnode($self);
-
my @ref = $self->_delparent
($pref);
+
$self->_deldxchan
($pref);
my @nodes;
my $ncall = $self->{call};
my @nodes;
my $ncall = $self->{call};
- # is this the last connection, I have no
parents
anymore?
- unless (@
ref
) {
+ # is this the last connection, I have no
dxchan
anymore?
+ unless (@
{$self->{dxchan}}
) {
foreach my $rcall (@{$self->{nodes}}) {
next if grep $rcall eq $_, @_;
my $r = Route::Node::get($rcall);
foreach my $rcall (@{$self->{nodes}}) {
next if grep $rcall eq $_, @_;
my $r = Route::Node::get($rcall);
@@
-110,11
+112,11
@@
sub del
sub del_nodes
{
sub del_nodes
{
- my $
parent
= shift;
+ my $
dxchan
= shift;
my @out;
my @out;
- foreach my $rcall (@{$
parent
->{nodes}}) {
+ foreach my $rcall (@{$
dxchan
->{nodes}}) {
my $r = get($rcall);
my $r = get($rcall);
- push @out, $r->del($
parent, $parent
->{call}, @_) if $r;
+ push @out, $r->del($
dxchan, $dxchan
->{call}, @_) if $r;
}
return @out;
}
}
return @out;
}
@@
-140,7
+142,7
@@
sub add_user
my $uref = Route::User::get($ucall);
my @out;
if ($uref) {
my $uref = Route::User::get($ucall);
my @out;
if ($uref) {
- @out = $uref->add
parent
($self);
+ @out = $uref->add
dxchan
($self);
} else {
$uref = Route::User->new($ucall, $self->{call}, @_);
@out = $uref;
} else {
$uref = Route::User->new($ucall, $self->{call}, @_);
@out = $uref;
@@
-211,11
+213,12
@@
sub new
confess "already have $call in $pkg" if $list{$call};
my $self = $pkg->SUPER::new($call);
confess "already have $call in $pkg" if $list{$call};
my $self = $pkg->SUPER::new($call);
- $self->{
parent
} = ref $pkg ? [ $pkg->{call} ] : [ ];
+ $self->{
dxchan
} = ref $pkg ? [ $pkg->{call} ] : [ ];
$self->{version} = shift;
$self->{flags} = shift;
$self->{users} = [];
$self->{nodes} = [];
$self->{version} = shift;
$self->{flags} = shift;
$self->{users} = [];
$self->{nodes} = [];
+ $self->{lid} = 0;
$list{$call} = $self;
$list{$call} = $self;
@@
-236,31
+239,6
@@
sub get_all
return values %list;
}
return values %list;
}
-sub _addparent
-{
- my $self = shift;
- return $self->_addlist('parent', @_);
-}
-
-sub _delparent
-{
- my $self = shift;
- return $self->_dellist('parent', @_);
-}
-
-
-sub _addnode
-{
- my $self = shift;
- return $self->_addlist('nodes', @_);
-}
-
-sub _delnode
-{
- my $self = shift;
- return $self->_dellist('nodes', @_);
-}
-
sub _adduser
{
sub _adduser
{
@@
-290,19
+268,16
@@
sub DESTROY
sub AUTOLOAD
{
no strict;
sub AUTOLOAD
{
no strict;
-
- my $self = shift;
- $name = $AUTOLOAD;
+ my $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
return if $name =~ /::DESTROY$/;
- $name =~ s/.*:://o;
+ $name =~ s/
^
.*:://o;
confess "Non-existant field '$AUTOLOAD'" unless $valid{$name} || $Route::valid{$name};
# this clever line of code creates a subroutine which takes over from autoload
# from OO Perl - Conway
confess "Non-existant field '$AUTOLOAD'" unless $valid{$name} || $Route::valid{$name};
# this clever line of code creates a subroutine which takes over from autoload
# from OO Perl - Conway
-# print "AUTOLOAD: $AUTOLOAD\n";
-# *{$AUTOLOAD} = sub {my $self = shift; @_ ? $self->{$name} = shift : $self->{$name}} ;
- @_ ? $self->{$name} = shift : $self->{$name} ;
+ *$AUTOLOAD = sub {$_[0]->{$name} = $_[1] if @_ > 1; return $_[0]->{$name}};
+ goto &$AUTOLOAD;
}
1;
}
1;