projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[spider.git]
/
perl
/
Route
/
User.pm
diff --git
a/perl/Route/User.pm
b/perl/Route/User.pm
index 4e3e59cf7f7ccae64502c5a566653ba7750318a1..cc1e2d7e7bbe9953cf31ed967ccb93802a90898e 100644
(file)
--- a/
perl/Route/User.pm
+++ b/
perl/Route/User.pm
@@
-10,28
+10,34
@@
package Route::User;
use DXDebug;
use Route;
use DXDebug;
use Route;
+use DXUtil;
use strict;
use strict;
-use vars qw(%list %valid @ISA $max);
+use vars qw($VERSION $BRANCH);
+($VERSION, $BRANCH) = dxver(q$Revision$);
+
+use vars qw(%list %valid @ISA $max $filterdef);
@ISA = qw(Route);
%valid = (
parent => '0,Parent Calls,parray',
);
@ISA = qw(Route);
%valid = (
parent => '0,Parent Calls,parray',
);
+$filterdef = $Route::filterdef;
%list = ();
$max = 0;
sub count
{
%list = ();
$max = 0;
sub count
{
- my $n = scalar
%list
;
+ my $n = scalar
(keys %list)
;
$max = $n if $n > $max;
return $n;
}
sub max
{
$max = $n if $n > $max;
return $n;
}
sub max
{
+ count();
return $max;
}
return $max;
}
@@
-45,27
+51,36
@@
sub new
my $self = $pkg->SUPER::new($call);
$self->{parent} = [ $ncall ];
my $self = $pkg->SUPER::new($call);
$self->{parent} = [ $ncall ];
- $self->{flags} = $flags;
+ $self->{flags} = $flags
|| Route::here(1)
;
$list{$call} = $self;
return $self;
}
$list{$call} = $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;
- delete $list{$self->{call}};
- return ($ref);
+ $self->delparent($pref);
+ unless (@{$self->{parent}}) {
+ delete $list{$self->{call}};
+ return $self;
+ }
+ return undef;
}
sub get
{
my $call = shift;
$call = shift if ref $call;
}
sub get
{
my $call = shift;
$call = shift if ref $call;
- return $list{uc $call};
+ my $ref = $list{uc $call};
+ dbg("Failed to get User $call" ) if !$ref && isdbg('routerr');
+ return $ref;
}
sub addparent
}
sub addparent
@@
-87,18
+102,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;