openinteract-commits

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30861/Setup

Modified Files:
	InitializeActions.pm 
Log Message:
pass in the action name when running 'init_at_startup()'

Index: InitializeActions.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup/InitializeActions.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InitializeActions.pm	18 Mar 2005 04:09:51 -0000	1.2
--- InitializeActions.pm	29 Mar 2005 16:58:46 -0000	1.3
***************
*** 32,36 ****
      }
      $self->_require_action_classes( $action_table );
!     $self->_initialize_action_classes;
  }
  
--- 32,36 ----
      }
      $self->_require_action_classes( $action_table );
!     $self->_initialize_action_classes( $action_table );
  }
  
***************
*** 45,65 ****
          $uniq_classes{ $class }++;
      }
      my $req = OpenInteract2::Setup->new(
          'require classes',
!         classes      => [ keys %uniq_classes ],
          classes_type => 'Action classes',
      )->run();
!     $self->param( classes => $req->param( 'required_classes' ) );
  }
  
  sub _initialize_action_classes {
!     my ( $self ) = @_;
!     my $action_classes = $self->param( 'classes' );
!     return unless ( ref $action_classes eq 'ARRAY' );
! 
      my @success = ();
!     foreach my $action_class ( @{ $action_classes } ) {
!         $log->debug( "Initializing action class '$action_class'" );
!         eval { $action_class->init_at_startup() };
          if ( $@ ) {
              $log->error( "Caught error initializing action class ",
--- 45,65 ----
          $uniq_classes{ $class }++;
      }
+     my @classes = keys %uniq_classes;
      my $req = OpenInteract2::Setup->new(
          'require classes',
!         classes      => \@classes,
          classes_type => 'Action classes',
      )->run();
!     $self->param( classes => \@classes );
  }
  
  sub _initialize_action_classes {
!     my ( $self, $action_table ) = @_;
      my @success = ();
!     while ( my ( $name, $action_info ) = each %{ $action_table } ) {
!         my $action_class = $action_info->{class};
!         next unless ( $action_class );
!         $log->debug( "Initializing action '$name' class '$action_class'" );
!         eval { $action_class->init_at_startup( $name ) };
          if ( $@ ) {
              $log->error( "Caught error initializing action class ",