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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.2 by joko, Thu Feb 20 19:37:09 2003 UTC revision 1.4 by joko, Sat Feb 22 16:48:58 2003 UTC
# Line 2  Line 2 
2  ##  $Id$  ##  $Id$
3  ## ----------------------------------------------------------------------  ## ----------------------------------------------------------------------
4  ##  $Log$  ##  $Log$
5    ##  Revision 1.4  2003/02/22 16:48:58  joko
6    ##  modified rapcall behaviour
7    ##
8    ##  Revision 1.3  2003/02/21 07:39:13  joko
9    ##  modified 'rapcall' processing
10    ##  modified merging of options/arguments in there
11    ##
12  ##  Revision 1.2  2003/02/20 19:37:09  joko  ##  Revision 1.2  2003/02/20 19:37:09  joko
13  ##  renamed modules  ##  renamed modules
14  ##  - removed command 'exec'  ##  - removed command 'exec'
# Line 210  sub _rapcall { Line 217  sub _rapcall {
217    my $args = shift;    my $args = shift;
218    
219    if (my $container = $self->getContainer()) {    if (my $container = $self->getContainer()) {
220      my $opts = merge($container, $args);      #my $opts = merge($container, $args);
221      if ($opts->{executable}) {      #print Dumper($container);
222        $self->run_executable($opts);      merge_to($args, $container, { init => 1 });
223      }    }
224      
225      # trace
226        #print Dumper($args);
227    
228      #print Dumper($opts);    if ($args->{executable}) {
229        $self->run_executable($args);
230      return;      return;
231    }    }
232    
233    if (my $command = $args->{command}) {    if (my $command = $args->{command}) {
234      $self->perform_command($command, $args);      $self->perform_command($command, $args);
235        return;
236    }    }
237    
238    if (my $target = $args->{target}) {    if (my $target = $args->{target}) {
239      $self->performTarget($target, $args);      $self->performTarget($target, $args);
240        return;
241    }    }
242    
243    if (my $method = $args->{method}) {    if (my $method = $args->{method}) {
# Line 238  sub _rapcall { Line 251  sub _rapcall {
251      } elsif (my $ref = $self->getInstance()) {      } elsif (my $ref = $self->getInstance()) {
252        $ref->$method();        $ref->$method();
253      }      }
254        
255        return;
256    
257    }    }
258        
259  }  }

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.4

MailToCvsAdmin">MailToCvsAdmin
ViewVC Help
Powered by ViewVC 1.1.26 RSS 2.0 feed