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 08b74c737295b15006a959e431a0eaa34b19fd42..f80e58e324ce5c8e19050d6b03537602fee12777 100644
(file)
--- a/
perl/Route/Node.pm
+++ b/
perl/Route/Node.pm
@@
-14,12
+14,6
@@
use Route::User;
use strict;
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;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
use vars qw(%list %valid @ISA $max $filterdef);
@ISA = qw(Route);
use vars qw(%list %valid @ISA $max $filterdef);
@ISA = qw(Route);
@@
-29,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;
@@
-90,12
+87,12
@@
sub del
# delete parent from this call's parent list
$pref->_delnode($self);
# delete parent from this call's parent list
$pref->_delnode($self);
-
my @ref =
$self->_delparent($pref);
+ $self->_delparent($pref);
my @nodes;
my $ncall = $self->{call};
# is this the last connection, I have no parents anymore?
my @nodes;
my $ncall = $self->{call};
# 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);
@@
-108,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;
@@
-189,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;
@@
-290,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;