[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 SQLInstall.pm,1.27,1.28

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

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

Modified Files:
	SQLInstall.pm 
Log Message:
OIN-134: ensure that the files given to us to restrict by aren't blank/empty


Index: SQLInstall.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/SQLInstall.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** SQLInstall.pm	26 Feb 2005 04:14:18 -0000	1.27
--- SQLInstall.pm	26 Feb 2005 22:51:26 -0000	1.28
***************
*** 167,170 ****
--- 167,174 ----
  sub install_structure {
      my ( $self, @restrict_files ) = @_;
+ 
+     # filter out empty/undef items
+     @restrict_files = grep { $_ } @restrict_files;
+ 
      my $pkg = $self->package;
      unless ( UNIVERSAL::isa( $self->package, 'OpenInteract2::Package' ) ) {
***************
*** 174,178 ****
      $log->is_info &&
          $log->info( "Installing structure for package ",
!                     $self->package->full_name );
  
      my $package_name = $pkg->name;
--- 178,183 ----
      $log->is_info &&
          $log->info( "Installing structure for package ",
!                     $self->package->full_name, "and skipping files [",
!                     join( '] [', @restrict_files ), ']' );
  
      my $package_name = $pkg->name;
***************
*** 233,242 ****
              $self->get_structure_file( $structure_set, $driver_name )
          );
!         my %restrict_to_files = map { $_ => 1 } @restrict_files;
          foreach my $structure_file ( @all_files ) {
!             if ( scalar @restrict_files
!                      and ! $restrict_to_files{ $structure_file } ) {
!                 $log->info( "Skipping file '$structure_file' since files ",
!                             "were specified and it's not in the list" );
                  next;
              }
--- 238,250 ----
              $self->get_structure_file( $structure_set, $driver_name )
          );
! 
!         my $num_skip_files = scalar  ;
!         my %restrict_to = map { $_ => 1 } @restrict_files;
! 
          foreach my $structure_file ( @all_files ) {
!             if ( $num_skip_files and ! $restrict_to{ $structure_file } ) {
!                 $log->info( "Skipping file '$structure_file' since ",
!                             "$num_skip_files files were specified to ",
!                             "skip and this one is not in the list" );
                  next;
              }