--- nfo/perl/libs/Data/Rap/Command.pm 2003/02/21 07:39:13 1.3 +++ nfo/perl/libs/Data/Rap/Command.pm 2003/02/22 16:48:58 1.4 @@ -1,7 +1,10 @@ ## ---------------------------------------------------------------------- -## $Id: Command.pm,v 1.3 2003/02/21 07:39:13 joko Exp $ +## $Id: Command.pm,v 1.4 2003/02/22 16:48:58 joko Exp $ ## ---------------------------------------------------------------------- ## $Log: Command.pm,v $ +## Revision 1.4 2003/02/22 16:48:58 joko +## modified rapcall behaviour +## ## Revision 1.3 2003/02/21 07:39:13 joko ## modified 'rapcall' processing ## modified merging of options/arguments in there @@ -215,11 +218,17 @@ if (my $container = $self->getContainer()) { #my $opts = merge($container, $args); - #print Dumper($opts); - merge_to($args, $container); + #print Dumper($container); + merge_to($args, $container, { init => 1 }); } - #print Dumper($args); + # trace + #print Dumper($args); + + if ($args->{executable}) { + $self->run_executable($args); + return; + } if (my $command = $args->{command}) { $self->perform_command($command, $args); @@ -246,12 +255,6 @@ return; } - - if ($args->{executable}) { - $self->run_executable($args); - return; - } - }