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 bf72bbb52eb2c7c0d74dc0b963070fb25dcaaf8e..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 = (
-                 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,44 @@ 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, $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->_addlist('parent', @_);
+       return @{$self->{nodes}};
 }
 
-sub delparent
+#
+# pc59 entity encoding and decoding
+#
+sub enc_pc59
 {
        my $self = shift;
-    return $self->_dellist('parent', @_);
+       my $sort = shift || 'U';
+       my $out = "$sort$self->{flags}$self->{call}";
+       return $out;
 }
 
 #
@@ -104,18 +128,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;