mega-merge of major parts of mojo

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

diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index 46ee36d0128567985146a07428743083ecdafa1f..8c1c824de5f58d4bf5e389aee4b40d675f259c65 100644 (file)
--- a/perl/Route/User.pm
+++ b/perl/Route/User.pm
@@ -3,29 +3,20 @@
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
-# $Id$
+#
 # 
 
 package Route::User;
 
 use DXDebug;
 use Route;
+use DXUtil;
 
 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));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);
 
-%valid = (
-                 parent => '0,Parent Calls,parray',
-);
-
 $filterdef = $Route::filterdef;
 %list = ();
 $max = 0;
@@ -49,12 +40,16 @@ 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 || Route::here(1);
+       $self->{ip} = $ip if defined $ip;
        $list{$call} = $self;
+       dbg("CLUSTER: user $call added") if isdbg('cluster');
 
        return $self;
 }
@@ -68,9 +63,11 @@ sub del
 {
        my $self = shift;
        my $pref = shift;
+       my $call = $self->{call};
        $self->delparent($pref);
        unless (@{$self->{parent}}) {
-               delete $list{$self->{call}};
+               delete $list{$call};
+               dbg("CLUSTER: user $call deleted") if isdbg('cluster');
                return $self;
        }
        return undef;