--- nfo/perl/libs/Data/Rap/Command.pm	2003/02/20 19:37:09	1.2
+++ nfo/perl/libs/Data/Rap/Command.pm	2003/02/21 07:39:13	1.3
@@ -1,7 +1,11 @@
 ## ----------------------------------------------------------------------
-##  $Id: Command.pm,v 1.2 2003/02/20 19:37:09 joko Exp $
+##  $Id: Command.pm,v 1.3 2003/02/21 07:39:13 joko Exp $
 ## ----------------------------------------------------------------------
 ##  $Log: Command.pm,v $
+##  Revision 1.3  2003/02/21 07:39:13  joko
+##  modified 'rapcall' processing
+##  modified merging of options/arguments in there
+##
 ##  Revision 1.2  2003/02/20 19:37:09  joko
 ##  renamed modules
 ##  - removed command 'exec'
@@ -210,21 +214,21 @@
   my $args = shift;
 
   if (my $container = $self->getContainer()) {
-    my $opts = merge($container, $args);
-    if ($opts->{executable}) {
-      $self->run_executable($opts);
-    }
-
+    #my $opts = merge($container, $args);
     #print Dumper($opts);
-    return;
+    merge_to($args, $container);
   }
+  
+  #print Dumper($args);
 
   if (my $command = $args->{command}) {
     $self->perform_command($command, $args);
+    return;
   }
 
   if (my $target = $args->{target}) {
     $self->performTarget($target, $args);
+    return;
   }
 
   if (my $method = $args->{method}) {
@@ -238,7 +242,16 @@
     } elsif (my $ref = $self->getInstance()) {
       $ref->$method();
     }
+    
+    return;
+
   }
+
+  if ($args->{executable}) {
+    $self->run_executable($args);
+    return;
+  }
+  
   
 }