X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FUser.pm;h=551b32e61dd512dc9fc445068a29b8ee2b45ee44;hb=776d7bb9277c9d24708e297f240395b51b0aaa93;hp=e510a165e2736e1d78cac926f419a0678716e192;hpb=3634fba90a64fe488d237f438d9945d81158da52;p=spider.git

diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index e510a165..551b32e6 100644
--- a/perl/Route/User.pm
+++ b/perl/Route/User.pm
@@ -10,15 +10,10 @@ package Route::User;
 
 use DXDebug;
 use Route;
+use DXUtil;
 
 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);
 
@@ -53,18 +48,27 @@ sub new
 	
 	my $self = $pkg->SUPER::new($call);
 	$self->{parent} = [ $ncall ];
-	$self->{flags} = $flags;
+	$self->{flags} = $flags || Route::here(1);
 	$list{$call} = $self;
 
 	return $self;
 }
 
+sub get_all
+{
+	return values %list;
+}
+
 sub del
 {
 	my $self = shift;
 	my $pref = shift;
-	my @out = $self->delparent($pref);
-	return @out;
+	$self->delparent($pref);
+	unless (@{$self->{parent}}) {
+		delete $list{$self->{call}};
+		return $self;
+	}
+	return undef;
 }
 
 sub get
@@ -95,18 +99,17 @@ sub delparent
 sub AUTOLOAD
 {
 	no strict;
-
-	my $self = shift;
-	$name = $AUTOLOAD;
-	return if $name =~ /::DESTROY$/;
-	$name =~ s/.*:://o;
+	my ($pkg,$name) = $AUTOLOAD =~ /^(.*)::(\w+)$/;
+	return if $name eq 'DESTROY';
   
 	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 {$_[0]->{$name} = $_[1] if @_ > 1; return $_[0]->{$name}};
+	goto &$AUTOLOAD;	
+#	*{"${pkg}::$name"} = sub {$_[0]->{$name} = $_[1] if @_ > 1; return $_[0]->{$name}};
+#	goto &{"${pkg}::$name"};	
 }
 
 1;