projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add an RBN line to progress
[spider.git]
/
perl
/
Route
/
User.pm
diff --git
a/perl/Route/User.pm
b/perl/Route/User.pm
index bc28dbef511053f809ce75171775d88a8e20feb9..e99def158bcedfa087028790ae74882160c4ed44 100644
(file)
--- a/
perl/Route/User.pm
+++ b/
perl/Route/User.pm
@@
-3,29
+3,20
@@
#
# Copyright (c) 2001 Dirk Koopman G1TLH
#
#
# Copyright (c) 2001 Dirk Koopman G1TLH
#
-#
$Id$
+#
#
package Route::User;
use DXDebug;
use Route;
#
package Route::User;
use DXDebug;
use Route;
+use DXUtil;
use strict;
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;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
use vars qw(%list %valid @ISA $max $filterdef);
@ISA = qw(Route);
use vars qw(%list %valid @ISA $max $filterdef);
@ISA = qw(Route);
-%valid = (
- parent => '0,Parent Calls,parray',
-);
-
$filterdef = $Route::filterdef;
%list = ();
$max = 0;
$filterdef = $Route::filterdef;
%list = ();
$max = 0;
@@
-39,6
+30,7
@@
sub count
sub max
{
sub max
{
+ count();
return $max;
}
return $max;
}
@@
-48,24
+40,37
@@
sub new
my $call = uc shift;
my $ncall = uc shift;
my $flags = shift;
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 ];
confess "already have $call in $pkg" if $list{$call};
my $self = $pkg->SUPER::new($call);
$self->{parent} = [ $ncall ];
- $self->{flags} = $flags;
+ $self->{flags} = $flags || Route::here(1);
+ $self->{ip} = $ip if defined $ip;
$list{$call} = $self;
$list{$call} = $self;
+ dbg("CLUSTER: user $call added") if isdbg('cluster');
return $self;
}
return $self;
}
+sub get_all
+{
+ return values %list;
+}
+
sub del
{
my $self = shift;
my $pref = shift;
sub del
{
my $self = shift;
my $pref = shift;
- my $ref = $self->delparent($pref->{call});
- return () if @$ref;
- my @out = delete $list{$self->{call}};
- return @out;
+ my $call = $self->{call};
+ $self->delparent($pref);
+ unless (@{$self->{parent}}) {
+ delete $list{$call};
+ dbg("CLUSTER: user $call deleted") if isdbg('cluster');
+ return $self;
+ }
+ return undef;
}
sub get
}
sub get
@@
-89,6
+94,8
@@
sub delparent
return $self->_dellist('parent', @_);
}
return $self->_dellist('parent', @_);
}
+
+
#
# generic AUTOLOAD for accessors
#
#
# generic AUTOLOAD for accessors
#
@@
-96,18
+103,17
@@
sub delparent
sub AUTOLOAD
{
no strict;
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
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;
}
1;