X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FUser.pm;h=d3cfb7d34abfec26b9f814a9141126665517e866;hb=8c23f70c2487e906a80ef323763cb7cb123baf28;hp=b9862e6de5f0b847a627a4af0279e2043cc85660;hpb=7b616aeabce92e3cb416a5fe6640a288adfe5410;p=spider.git

diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index b9862e6d..d3cfb7d3 100644
--- a/perl/Route/User.pm
+++ b/perl/Route/User.pm
@@ -14,8 +14,8 @@ use Route;
 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,0));
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /:\s+(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /:\s+\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -23,7 +23,8 @@ use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);
 
 %valid = (
-		  parent => '0,Parent Calls,parray',
+		  dxchan => '0,Dxchan List,parray',
+		  nodes => '0,On Node(s),parray',
 );
 
 $filterdef = $Route::filterdef;
@@ -48,32 +49,27 @@ sub new
 	my $pkg = shift;
 	my $call = uc shift;
 	my $ncall = uc shift;
-	my $flags = shift;
+	my $flags = shift || Route::here(1);
 	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;
 
 	return $self;
 }
 
-sub get_all
+sub delete
 {
-	return values %list;
+	my $self = shift;
+	dbg("deleting Route::User $self->{call}") if isdbg('routelow');
+	delete $list{$self->{call}};
 }
 
-sub del
+sub get_all
 {
-	my $self = shift;
-	my $pref = shift;
-	$self->delparent($pref);
-	unless (@{$self->{parent}}) {
-		delete $list{$self->{call}};
-		return $self;
-	}
-	return undef;
+	return values %list;
 }
 
 sub get
@@ -85,16 +81,33 @@ sub get
 	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) : ();
+}
+
+# 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 delparent
+sub nodes
 {
 	my $self = shift;
-    return $self->_dellist('parent', @_);
+	return @{$self->{nodes}};
 }
 
 #