/[cvs]/nfo/perl/libs/Data/Rap/Command.pm

Diff of /nfo/perl/libs/Data/Rap/Command.pm

-revision 1.2 by joko,
Thu Feb 20 19:37:09 2003 UTC
+revision 1.3 by joko,
Fri Feb 21 07:39:13 2003 UTC
 Line 2
  ##  $Id$
  ## ----------------------------------------------------------------------
  ##  $Log$
+ ##  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'
-Line 210 
 sub _rapcall {
+Line 214 
 sub _rapcall {
    my $args = shift;
    if (my $container = $self->getContainer()) {
-     my $opts = merge($container, $args);
+     #my $opts = merge($container, $args);
-     if ($opts->{executable}) {
-       $self->run_executable($opts);
-     }
      #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}) {
-Line 238 
 sub _rapcall {
+Line 242 
 sub _rapcall {
      } elsif (my $ref = $self->getInstance()) {
        $ref->$method();
      }
+     return;
    }
+   if ($args->{executable}) {
+     $self->run_executable($args);
+     return;
+   }
  }

 Legend:



Removed from v.1.2
 


changed lines


 
Added in v.1.3
 Legend:



Removed from v.1.2
 


changed lines


 
Added in v.1.3
-Removed from v.1.2
+Added in v.1.3

MailToCvsAdmin">MailToCvsAdmin	ViewVC Help
Powered by ViewVC 1.1.26