[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Datasource DBI.pm,1.15,1.16

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

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

Modified Files:
	DBI.pm 
Log Message:
don't throw an error if no dbi_type available when we do the resolve...

Index: DBI.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Datasource/DBI.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DBI.pm	19 Feb 2005 04:27:07 -0000	1.15
--- DBI.pm	22 Feb 2005 16:57:24 -0000	1.16
***************
*** 121,133 ****
  
      my $dbi_type = lc $ds_info->{dbi_type};
!     unless ( $dbi_type or $DBI_INFO{ $dbi_type } ) {
!         oi_error "DBI datasource configuration '$name' has an invalid ",
!                  "'dbi_type'; allowed values: ",
!                  join( ', ', sort keys %DBI_INFO );
      }
-     my $dbi_info = $DBI_INFO{ $dbi_type };
-     $info{spops}       = $dbi_info->[0];
-     $info{driver_name} = ( 'yes' eq lc $ds_info->{use_odbc} )
-                            ? 'ODBC' : $dbi_info->[1];
      return \%info;
  }
--- 121,135 ----
  
      my $dbi_type = lc $ds_info->{dbi_type};
!     if ( $dbi_type ) {
!         unless ( $DBI_INFO{ $dbi_type } ) {
!             oi_error "DBI datasource configuration '$name' has an invalid ",
!                      "'dbi_type' of '$dbi_type'; allowed values: ",
!                      join( ', ', sort keys %DBI_INFO );
!         }
!         my $dbi_info = $DBI_INFO{ $dbi_type };
!         $info{spops}       = $dbi_info->[0];
!         $info{driver_name} = ( 'yes' eq lc $ds_info->{use_odbc} )
!                                ? 'ODBC' : $dbi_info->[1];
      }
      return \%info;
  }