X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FUser.pm;h=8c1c824de5f58d4bf5e389aee4b40d675f259c65;hb=4b207544da78b182bd12e94eab01451694749012;hp=4e3e59cf7f7ccae64502c5a566653ba7750318a1;hpb=b67b50de92dbf61ce939b42f7c74e30dc58eba41;p=spider.git

diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index 4e3e59cf..8c1c824d 100644
--- a/perl/Route/User.pm
+++ b/perl/Route/User.pm
@@ -3,35 +3,34 @@
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
-# $Id$
+#
 # 
 
 package Route::User;
 
 use DXDebug;
 use Route;
+use DXUtil;
 
 use strict;
 
-use vars qw(%list %valid @ISA $max);
+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;
 }
 
@@ -41,31 +40,46 @@ sub new
 	my $call = uc shift;
 	my $ncall = uc shift;
 	my $flags = shift;
+	my $ip = shift;
+
 	confess "already have $call in $pkg" if $list{$call};
 	
 	my $self = $pkg->SUPER::new($call);
 	$self->{parent} = [ $ncall ];
-	$self->{flags} = $flags;
+	$self->{flags} = $flags || Route::here(1);
+	$self->{ip} = $ip if defined $ip;
 	$list{$call} = $self;
+	dbg("CLUSTER: user $call added") if isdbg('cluster');
 
 	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);
+	my $call = $self->{call};
+	$self->delparent($pref);
+	unless (@{$self->{parent}}) {
+		delete $list{$call};
+		dbg("CLUSTER: user $call deleted") if isdbg('cluster');
+		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
@@ -87,18 +101,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;