--- nfo/perl/libs/Data/Rap/Engine.pm	2003/02/22 16:51:21	1.4
+++ nfo/perl/libs/Data/Rap/Engine.pm	2003/03/28 07:02:56	1.7
@@ -1,7 +1,16 @@
 ## ----------------------------------------------------------------------
-##  $Id: Engine.pm,v 1.4 2003/02/22 16:51:21 joko Exp $
+##  $Id: Engine.pm,v 1.7 2003/03/28 07:02:56 joko Exp $
 ## ----------------------------------------------------------------------
 ##  $Log: Engine.pm,v $
+##  Revision 1.7  2003/03/28 07:02:56  joko
+##  modified structure around '$wrapper_program'
+##
+##  Revision 1.6  2003/03/27 15:31:05  joko
+##  fixes to modules regarding new namespace(s) below Data::Mungle::*
+##
+##  Revision 1.5  2003/03/27 15:03:03  joko
+##  enhanced 'sub run_executable'
+##
 ##  Revision 1.4  2003/02/22 16:51:21  joko
 ##  + enhanced run_executable
 ##  modified logging output
@@ -31,8 +40,8 @@
 use Iterate;
 
 use shortcuts qw( run_cmd );
-use Data::Code::Ref qw( ref_slot );
-use Data::Transform::Deep qw( expand );
+use Data::Mungle::Code::Ref qw( ref_slot );
+use Data::Mungle::Transform::Deep qw( expand );
 
 
 sub performTarget {
@@ -296,6 +305,16 @@
     my $program = $opts->{executable};
     delete $opts->{executable};
 
+    # determine execution method
+    my $wrapper_program = '';
+    
+    # check if program is a namespace-string (contains '::') - use 'do' in this case!
+    if ($program =~ /::/) {
+      #$wrapper_program = 'rap.pl';
+      $wrapper_program = $0;
+    }
+
+    # prepare arguments
     my @buf;
     foreach (keys %$opts) {
       my $value = $opts->{$_};
@@ -314,8 +333,9 @@
       }
       push @buf, "--$_=$value";
     }
-  
-    my $cmd = $program . ' ' . join(' ', @buf);
+
+    # build {program} & {arguments}  
+    my $cmd = ($wrapper_program ? $wrapper_program . ' ' : '') . $program . ' ' . join(' ', @buf);
     
     # trace
       #print "command: $cmd", "\n";
@@ -328,10 +348,24 @@
       $ENV{PERL5LIB} = $INC[0];
       
       #print Dumper(%ENV);
-      run_cmd($cmd);
+      
+      #print "command: '$cmd'", "\n";
+
+      # V1 - basic
+      #run_cmd($cmd);
+
+      # V1.b - enhanced: variable local method
+      my $evalstr = "run_cmd('$cmd', 'Some task...', { async => 1 });";
+      eval($evalstr);
+      #my $res = do "$cmd";
+      #print $res, "\n" if $res;
+
+      #$self->log("run_executable: $evalstr", 'info');
+      $self->raiseException("run_executable: $evalstr\n$@") if $@;
+
       # V2: via IPC::Run
       # ....  (TODO)
-    
+      
     
   }