projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add 1704 cty.dat data
[spider.git]
/
perl
/
Route
/
User.pm
diff --git
a/perl/Route/User.pm
b/perl/Route/User.pm
index e510a165e2736e1d78cac926f419a0678716e192..cc1e2d7e7bbe9953cf31ed967ccb93802a90898e 100644
(file)
--- a/
perl/Route/User.pm
+++ b/
perl/Route/User.pm
@@
-10,14
+10,12
@@
package Route::User;
use DXDebug;
use Route;
use DXDebug;
use Route;
+use DXUtil;
use strict;
use vars qw($VERSION $BRANCH);
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;
+($VERSION, $BRANCH) = dxver(q$Revision$);
use vars qw(%list %valid @ISA $max $filterdef);
@ISA = qw(Route);
use vars qw(%list %valid @ISA $max $filterdef);
@ISA = qw(Route);
@@
-53,18
+51,27
@@
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 @out = $self->delparent($pref);
- return @out;
+ $self->delparent($pref);
+ unless (@{$self->{parent}}) {
+ delete $list{$self->{call}};
+ return $self;
+ }
+ return undef;
}
sub get
}
sub get
@@
-95,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;