X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FRoute%2FUser.pm;h=bcd98a00ed3e591c86a995ad3f8c8be1abebd794;hb=412fb1b9e4070d7791f4e986b55bbc0c06f612ea;hp=4e3e59cf7f7ccae64502c5a566653ba7750318a1;hpb=b67b50de92dbf61ce939b42f7c74e30dc58eba41;p=spider.git

diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index 4e3e59cf..bcd98a00 100644
--- a/perl/Route/User.pm
+++ b/perl/Route/User.pm
@@ -13,25 +13,33 @@ use Route;
 
 use strict;
 
-use vars qw(%list %valid @ISA $max);
+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);
 
 %valid = (
 		  parent => '0,Parent Calls,parray',
 );
 
+$filterdef = $Route::filterdef;
 %list = ();
 $max = 0;
 
 sub count
 {
-	my $n = scalar %list;
+	my $n = scalar(keys %list);
 	$max = $n if $n > $max;
 	return $n;
 }
 
 sub max
 {
+	count();
 	return $max;
 }
 
@@ -51,21 +59,30 @@ sub new
 	return $self;
 }
 
+sub get_all
+{
+	return values %list;
+}
+
 sub del
 {
 	my $self = shift;
 	my $pref = shift;
-	my $ref = $self->delparent($pref->{call});
-	return () if @$ref;
-	delete $list{$self->{call}};
-	return ($ref);
+	$self->delparent($pref);
+	unless (@{$self->{parent}}) {
+		delete $list{$self->{call}};
+		return $self;
+	}
+	return undef;
 }
 
 sub get
 {
 	my $call = shift;
 	$call = shift if ref $call;
-	return $list{uc $call};
+	my $ref = $list{uc $call};
+	dbg("Failed to get User $call" ) if !$ref && isdbg('routerr');
+	return $ref;
 }
 
 sub addparent