X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FUser.pm;h=ebccba9b722b2c7ee3a7f2d0e2d2fc6c0ffe92e9;hb=05a7fdd4a58c51e21b55b0509b054b625839290c;hp=4e3e59cf7f7ccae64502c5a566653ba7750318a1;hpb=b67b50de92dbf61ce939b42f7c74e30dc58eba41;p=spider.git

diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index 4e3e59cf..ebccba9b 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,0));
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
+use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);
 
 %valid = (
-		  parent => '0,Parent Calls,parray',
+		  dxchan => '0,Dxchan 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;
 }
 
@@ -44,40 +52,62 @@ sub new
 	confess "already have $call in $pkg" if $list{$call};
 	
 	my $self = $pkg->SUPER::new($call);
-	$self->{parent} = [ $ncall ];
+	$self->{nodes} = [ ];
 	$self->{flags} = $flags;
 	$list{$call} = $self;
+	dbg("creating Route::User $self->{call}") if isdbg('routelow');
 
 	return $self;
 }
 
-sub del
+sub delete
 {
 	my $self = shift;
-	my $pref = shift;
-	my $ref = $self->delparent($pref->{call});
-	return () if @$ref;
+	dbg("deleting Route::User $self->{call}") if isdbg('routelow');
 	delete $list{$self->{call}};
-	return ($ref);
+}
+
+sub get_all
+{
+	return values %list;
 }
 
 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
+# add a user to this node
+# returns Route::User if it is a new user;
+sub add_node
 {
-	my $self = shift;
-    return $self->_addlist('parent', @_);
+	my ($self, $nref) = @_;
+	my $r = $self->is_empty('nodes');
+	$self->_addlist('nodes', $nref);
+	$nref->_addlist('users', $self);
+	$nref->{usercount} = scalar @{$nref->{users}};
+	return $r ? ($self) : ();
 }
 
-sub delparent
+# delete a user from this node
+sub del_user
+{
+	my ($self, $nref) = @_;
+
+	$self->_dellist('nodes', $nref);
+	$nref->_dellist('users', $self);
+	$nref->{usercount} = scalar @{$nref->{users}};
+	return $self->is_empty('nodes') ? ($self) : ();
+}
+
+sub nodes
 {
 	my $self = shift;
-    return $self->_dellist('parent', @_);
+	return @{$self->{nodes}};
 }
 
 #
@@ -87,18 +117,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;