Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24033/lib/OpenInteract2/Setup
Modified Files:
ReadSPOPSConfig.pm ReadActionTable.pm
Log Message:
OIN-117: read the action/spops files from new location
Index: ReadSPOPSConfig.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup/ReadSPOPSConfig.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReadSPOPSConfig.pm 26 Feb 2005 23:31:25 -0000 1.2
--- ReadSPOPSConfig.pm 6 Mar 2005 15:08:05 -0000 1.3
***************
*** 50,55 ****
foreach my $spops_file ( @{ $filenames } ) {
$log->debug( "SPOPS file: $spops_file" );
! my $full_spops_path = $package->find_file( $spops_file );
! my $ini = $self->_read_ini( $full_spops_path );
next SPOPSFILE unless ( $ini );
--- 50,54 ----
foreach my $spops_file ( @{ $filenames } ) {
$log->debug( "SPOPS file: $spops_file" );
! my $ini = $self->_read_ini( $spops_file );
next SPOPSFILE unless ( $ini );
***************
*** 77,81 ****
$spops_assign{package_name} = $package->name;
$spops_assign{package_version} = $package->version;
! $spops_assign{package_config_file} = $full_spops_path;
$spops_assign{datasource} ||= $default_datasource;
--- 76,80 ----
$spops_assign{package_name} = $package->name;
$spops_assign{package_version} = $package->version;
! $spops_assign{package_config_file} = $spops_file;
$spops_assign{datasource} ||= $default_datasource;
Index: ReadActionTable.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup/ReadActionTable.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReadActionTable.pm 24 Jan 2005 17:17:31 -0000 1.1
--- ReadActionTable.pm 6 Mar 2005 15:08:05 -0000 1.2
***************
*** 53,60 ****
ACTIONFILE:
foreach my $action_file ( @{ $filenames } ) {
- my $full_action_path = $package->find_file( $action_file );
$log->debug( "Reading action file from package ",
! "$package_id: $full_action_path" );
! my $ini = $self->_read_ini( $full_action_path );
# error is added to log from _read_ini() call, don't do it here too
--- 53,59 ----
ACTIONFILE:
foreach my $action_file ( @{ $filenames } ) {
$log->debug( "Reading action file from package ",
! "$package_id: $action_file" );
! my $ini = $self->_read_ini( $action_file );
# error is added to log from _read_ini() call, don't do it here too
***************
*** 74,78 ****
}
my $action_data = $self->_create_single_action_data(
! $package, $full_action_path, $action_name, $ini->{ $action_name }
);
$ACTION->{ $action_name } = $action_data;
--- 73,77 ----
}
my $action_data = $self->_create_single_action_data(
! $package, $action_file, $action_name, $ini->{ $action_name }
);
$ACTION->{ $action_name } = $action_data;
|
