2 |
## $Id$ |
## $Id$ |
3 |
## ---------------------------------------------------------------------- |
## ---------------------------------------------------------------------- |
4 |
## $Log$ |
## $Log$ |
5 |
|
## Revision 1.3 2003/02/21 07:39:13 joko |
6 |
|
## modified 'rapcall' processing |
7 |
|
## modified merging of options/arguments in there |
8 |
|
## |
9 |
## Revision 1.2 2003/02/20 19:37:09 joko |
## Revision 1.2 2003/02/20 19:37:09 joko |
10 |
## renamed modules |
## renamed modules |
11 |
## - removed command 'exec' |
## - removed command 'exec' |
214 |
my $args = shift; |
my $args = shift; |
215 |
|
|
216 |
if (my $container = $self->getContainer()) { |
if (my $container = $self->getContainer()) { |
217 |
my $opts = merge($container, $args); |
#my $opts = merge($container, $args); |
|
if ($opts->{executable}) { |
|
|
$self->run_executable($opts); |
|
|
} |
|
|
|
|
218 |
#print Dumper($opts); |
#print Dumper($opts); |
219 |
return; |
merge_to($args, $container); |
220 |
} |
} |
221 |
|
|
222 |
|
#print Dumper($args); |
223 |
|
|
224 |
if (my $command = $args->{command}) { |
if (my $command = $args->{command}) { |
225 |
$self->perform_command($command, $args); |
$self->perform_command($command, $args); |
226 |
|
return; |
227 |
} |
} |
228 |
|
|
229 |
if (my $target = $args->{target}) { |
if (my $target = $args->{target}) { |
230 |
$self->performTarget($target, $args); |
$self->performTarget($target, $args); |
231 |
|
return; |
232 |
} |
} |
233 |
|
|
234 |
if (my $method = $args->{method}) { |
if (my $method = $args->{method}) { |
242 |
} elsif (my $ref = $self->getInstance()) { |
} elsif (my $ref = $self->getInstance()) { |
243 |
$ref->$method(); |
$ref->$method(); |
244 |
} |
} |
245 |
|
|
246 |
|
return; |
247 |
|
|
248 |
} |
} |
249 |
|
|
250 |
|
if ($args->{executable}) { |
251 |
|
$self->run_executable($args); |
252 |
|
return; |
253 |
|
} |
254 |
|
|
255 |
|
|
256 |
} |
} |
257 |
|
|