X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FUser.pm;h=eb9958dcff28999b25e3023f596a174aa643396f;hb=942cdc8c6434db4e2cf77b43ec26c0059768f853;hp=bc28dbef511053f809ce75171775d88a8e20feb9;hpb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;p=spider.git

diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index bc28dbef..eb9958dc 100644
--- a/perl/Route/User.pm
+++ b/perl/Route/User.pm
@@ -15,7 +15,7 @@ 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;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -39,6 +39,7 @@ sub count
 
 sub max
 {
+	count();
 	return $max;
 }
 
@@ -48,24 +49,38 @@ sub new
 	my $call = uc shift;
 	my $ncall = uc shift;
 	my $flags = shift;
-	confess "already have $call in $pkg" if $list{$call};
 	
 	my $self = $pkg->SUPER::new($call);
 	$self->{parent} = [ $ncall ];
 	$self->{flags} = $flags;
-	$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_all
+{
+	return values %list;
+}
+
 sub del
 {
 	my $self = shift;
 	my $pref = shift;
-	my $ref = $self->delparent($pref->{call});
-	return () if @$ref;
-	my @out = delete $list{$self->{call}};
-	return @out;
+	$self->delparent($pref);
+	unless (@{$self->{parent}}) {
+		delete $list{$self->{call}};
+		return $self;
+	}
+	return undef;
 }
 
 sub get
@@ -104,10 +119,8 @@ sub AUTOLOAD
   
 	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 {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
-    @_ ? $self->{$name} = shift : $self->{$name} ;
+	*$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
+	&$AUTOLOAD($self, @_);
 }
 
 1;