projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge back some files from SIMPLEROUTE
[spider.git]
/
perl
/
Route
/
Node.pm
diff --git
a/perl/Route/Node.pm
b/perl/Route/Node.pm
index e29fe3caefb1eeb393dd1322ff21f99ee3428888..f80e58e324ce5c8e19050d6b03537602fee12777 100644
(file)
--- a/
perl/Route/Node.pm
+++ b/
perl/Route/Node.pm
@@
-23,6
+23,9
@@
use vars qw(%list %valid @ISA $max $filterdef);
users => '0,Users,parray',
usercount => '0,User Count',
version => '0,Version',
users => '0,Users,parray',
usercount => '0,User Count',
version => '0,Version',
+ handle_xml => '0,Using XML,yesno',
+ lastmsg => '0,Last Route Msg,atime',
+ lastid => '0,Last Route MsgID',
);
$filterdef = $Route::filterdef;
);
$filterdef = $Route::filterdef;
@@
-38,6
+41,7
@@
sub count
sub max
{
sub max
{
+ count();
return $max;
}
return $max;
}
@@
-60,12
+64,12
@@
sub add
confess "Route::add trying to add $call to myself" if $call eq $parent->{call};
my $self = get($call);
if ($self) {
confess "Route::add trying to add $call to myself" if $call eq $parent->{call};
my $self = get($call);
if ($self) {
- $self->_addparent($parent
->{call}
);
- $parent->_addnode($
call
);
+ $self->_addparent($parent);
+ $parent->_addnode($
self
);
return undef;
}
return undef;
}
- $parent->_addnode($call);
$self = $parent->new($call, @_);
$self = $parent->new($call, @_);
+ $parent->_addnode($self);
return $self;
}
return $self;
}
@@
-82,14
+86,13
@@
sub del
my $pref = shift;
# delete parent from this call's parent list
my $pref = shift;
# delete parent from this call's parent list
- my $pcall = $pref->{call};
- my $ncall = $self->{call};
- $pref->_delnode($ncall);;
- my $ref = $self->_delparent($pcall);
+ $pref->_delnode($self);
+ $self->_delparent($pref);
my @nodes;
my @nodes;
+ my $ncall = $self->{call};
# is this the last connection, I have no parents anymore?
# is this the last connection, I have no parents anymore?
- unless (@
$ref
) {
+ unless (@
{$self->{parent}}
) {
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);
@@
-102,6
+105,21
@@
sub del
return @nodes;
}
return @nodes;
}
+# this deletes this node completely by grabbing the parents
+# and deleting me from them
+sub delete
+{
+ my $self = shift;
+ my @out;
+
+ $self->_del_users;
+ foreach my $call (@{$self->{parent}}) {
+ my $parent = Route::Node::get($call);
+ push @out, $parent->del($self) if $parent;
+ }
+ return @out;
+}
+
sub del_nodes
{
my $parent = shift;
sub del_nodes
{
my $parent = shift;
@@
-131,16
+149,17
@@
sub add_user
confess "Trying to add NULL User call to routing tables" unless $ucall;
confess "Trying to add NULL User call to routing tables" unless $ucall;
- $self->_adduser($ucall);
-
- $self->{usercount} = scalar @{$self->{users}};
my $uref = Route::User::get($ucall);
my @out;
if ($uref) {
my $uref = Route::User::get($ucall);
my @out;
if ($uref) {
-
$uref->addparent($self->{call}
);
+
@out = $uref->addparent($self
);
} else {
} else {
- @out = Route::User->new($ucall, $self->{call}, @_);
+ $uref = Route::User->new($ucall, $self->{call}, @_);
+ @out = $uref;
}
}
+ $self->_adduser($uref);
+ $self->{usercount} = scalar @{$self->{users}};
+
return @out;
}
return @out;
}
@@
-148,10
+167,16
@@
sub add_user
sub del_user
{
my $self = shift;
sub del_user
{
my $self = shift;
- my $ucall = shift;
- my $ref = Route::User::get($ucall);
- $self->_deluser($ucall);
- my @out = $ref->del($self) if $ref;
+ my $ref = shift;
+ my @out;
+
+ if ($ref) {
+ @out = $self->_deluser($ref);
+ $ref->del($self);
+ } else {
+ confess "tried to delete non-existant $ref->{call} from $self->{call}";
+ }
+ $self->{usercount} = scalar @{$self->{users}};
return @out;
}
return @out;
}
@@
-176,6
+201,12
@@
sub nodes
return @{$self->{nodes}};
}
return @{$self->{nodes}};
}
+sub parents
+{
+ my $self = shift;
+ return @{$self->{parent}};
+}
+
sub rnodes
{
my $self = shift;
sub rnodes
{
my $self = shift;
@@
-277,19
+308,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;