my $caller = ( caller(1) )[0]->isa('Catalyst::Dispatcher')
&& ( ( caller(2) )[3] =~ /::detach$/ ) ? caller(3) : caller(1);
- my $namespace = '/';
my $arguments = ( ref( $_[-1] ) eq 'ARRAY' ) ? pop(@_) : $c->req->args;
my $results = [];
- if ( $command =~ /^\// ) {
- if ( $command =~ /^\/(\w+)$/ ) {
- $results = $c->get_action( $1, $namespace );
- }
- else {
- my $command_copy = $command;
- my @extra_args;
- DESCEND: while ( $command_copy =~ s/^\/(.*)\/(\w+)$/\/$1/ ) {
- my $tail = $2;
- if ( $results = $c->get_action( $tail, $1 ) ) {
- $command = $tail;
- $namespace = $command_copy;
- push( @{$arguments}, @extra_args );
- last DESCEND;
- }
- unshift( @extra_args, $tail );
- }
- }
- $command =~ s/^\///;
+ my $command_copy = $command;
+
+ unless ( $command_copy =~ s/^\/// ) {
+ my $namespace =
+ Catalyst::Utils::class2prefix( $caller, $c->config->{case_sensitive} ) || '';
+ $command_copy = "${namespace}/${command}";
}
+ unless ( $command_copy =~ /\// ) {
+ $results = $c->get_action( $command_copy, '/' );
+ }
else {
- $namespace =
- Catalyst::Utils::class2prefix( $caller, $c->config->{case_sensitive} )
- || '/';
- $results = $c->get_action( $command, $namespace );
+ my @extra_args;
+ DESCEND: while ( $command_copy =~ s/^(.*)\/(\w+)$/$1/ ) {
+ my $tail = $2;
+ $results = $c->get_action( $tail, $1 );
+ if ( @{$results} ) {
+ $command = $tail;
+ push( @{$arguments}, @extra_args );
+ last DESCEND;
+ }
+ unshift( @extra_args, $tail );
+ }
}
unless ( @{$results} ) {
my @results;
if ($inherit) {
- my $result =
- $self->actions->{private}->{ $parent->getUID }->{$action};
- push @results, [$result] if $result;
+ #my $result =
+ # $self->actions->{private}->{ $parent->getUID }->{$action};
+ #push @results, [$result] if $result;
my $visitor = Tree::Simple::Visitor::FindByPath->new;
- SEARCH:
- for my $part ( split '/', $namespace ) {
- $visitor->setSearchPath($part);
- $parent->accept($visitor);
- my $child = $visitor->getResult;
- my $uid = $child->getUID if $child;
- my $match = $self->actions->{private}->{$uid}->{$action}
- if $uid;
- push @results, [$match] if $match;
- if ($child) {
- $parent = $child;
- }
- else {
- last SEARCH;
- }
+ #warn "${namespace} ${action}";
+ my @path = split(/\//, $namespace);
+ $visitor->setSearchPath( @path );
+ $parent->accept($visitor);
+
+ #warn join(', ', map { $_->getNodeValue } $visitor->getResults);
+
+ my @match = $visitor->getResults;
+ @match = ($parent) unless @match;
+
+ if (!defined $visitor->getResult) {
+ my $extra = $path[(scalar @match) - 1];
+ last unless $extra;
+ $visitor->setSearchPath($extra);
+ $match[-1]->accept($visitor);
+ push(@match, $visitor->getResult) if defined $visitor->getResult;
}
+ foreach my $child (@match) {
+ my $node = $self->actions->{private}->{$child->getUID};
+ next unless $node;
+ push(@results, [ $node->{$action} ]) if defined $node->{$action};
+ }
+
+ #SEARCH:
+ # for my $part ( split '/', $namespace ) {
+ # $visitor->setSearchPath($part);
+ # $parent->accept($visitor);
+ # my $child = $visitor->getResult;
+ # my $uid = $child->getUID if $child;
+ # my $match = $self->actions->{private}->{$uid}->{$action}
+ # if $uid;
+ # push @results, [$match] if $match;
+ # if ($child) {
+ # $parent = $child;
+ # }
+ # else {
+ # last SEARCH;
+ # }
+ # }
+
}
else {