move stuff around and try to get pc59 handling/generation more correct

[spider.git] / perl / Route / User.pm

diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index 88d2aa2a0d0fb5a8e1e8986614a5ef33d9afec07..7bf19d44a5babf7c6d10a665fc0bb4e3cb0c35f8 100644 (file)
--- 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 = (
-                 dxchan => '0,Dxchan 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->{nodes} = [ $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->deldxchan($pref);
-       unless (@{$self->{dxchan}}) {
-               delete $list{$self->{call}};
-               return $self;
-       }
-       return undef;
+       return values %list;
 }
 
 sub get
@@ -85,6 +81,46 @@ sub get
        return $ref;
 }
 
+# add a user to this node
+# returns Route::User if it is a new user;
+sub add_node
+{
+       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 nodes
+{
+       my $self = shift;
+       return @{$self->{nodes}};
+}
+
+#
+# pc59 entity encoding and decoding
+#
+sub enc_pc59
+{
+       my $self = shift;
+       my $sort = shift || 'U';
+       my $out = "$sort$self->{flags}$self->{call}";
+       return $out;
+}
+
 #
 # generic AUTOLOAD for accessors
 #