X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FNode.pm;h=a3cded54f095b08e565236b7f19f7bf5427d3aa5;hb=942cdc8c6434db4e2cf77b43ec26c0059768f853;hp=0c2b2e4a6f69c7d20449fc1005250a66f2869bda;hpb=7b616aeabce92e3cb416a5fe6640a288adfe5410;p=spider.git

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index 0c2b2e4a..a3cded54 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -74,6 +74,7 @@ sub add
 		return undef;
 	}
 	$self = $parent->new($call, @_);
+	$self->register;
 	$parent->_addnode($self);
 	return $self;
 }
@@ -145,6 +146,7 @@ sub add_user
 		@out = $uref->addparent($self);
 	} else {
 		$uref = Route::User->new($ucall, $self->{call}, @_);
+		$uref->register;
 		@out = $uref;
 	}
 	$self->_adduser($uref);
@@ -215,9 +217,6 @@ sub new
 {
 	my $pkg = shift;
 	my $call = uc shift;
-	
-	confess "already have $call in $pkg" if $list{$call};
-	
 	my $self = $pkg->SUPER::new($call);
 	$self->{parent} = ref $pkg ? [ $pkg->{call} ] : [ ];
 	$self->{version} = shift;
@@ -226,11 +225,16 @@ sub new
 	$self->{nodes} = [];
 	$self->{lid} = 0;
 	
-	$list{$call} = $self;
-	
 	return $self;
 }
 
+sub register
+{
+	my $self = shift;
+	confess "already have $call in $pkg" if $list{$self->{call}};
+	$list{$call} = $self;
+}
+
 sub get
 {
 	my $call = shift;
@@ -315,16 +319,16 @@ sub DESTROY
 sub AUTOLOAD
 {
 	no strict;
-	my $name = $AUTOLOAD;
+
+	my $self = shift;
+	$name = $AUTOLOAD;
 	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
-        *$AUTOLOAD = sub {$_[0]->{$name} = $_[1] if @_ > 1; return $_[0]->{$name}};
-        goto &$AUTOLOAD;
+	*$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
+	&$AUTOLOAD($self, @_);
 }
 
 1;