[Openinteract-commits] CVS: OpenInteract/OpenInteract/SPOPS DBI.pm,1.7,1.8

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

Update of /cvsroot/openinteract/OpenInteract/OpenInteract/SPOPS
In directory usw-pr-cvs1:/tmp/cvs-serv29728/OpenInteract/SPOPS

Modified Files:
	DBI.pm 
Log Message:
check the server config for the datasource name too


Index: DBI.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/SPOPS/DBI.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DBI.pm	2001/10/17 04:47:07	1.7
--- DBI.pm	2001/10/25 15:25:14	1.8
***************
*** 11,16 ****
  sub global_datasource_handle {
      my ( $self, $connect_key ) = @_;
!     $connect_key ||= $self->CONFIG->{datasource};
!     return OpenInteract::Request->instance->db( $connect_key );
  }
  
--- 11,18 ----
  sub global_datasource_handle {
      my ( $self, $connect_key ) = @_;
!     my $R = OpenInteract::Request->instance;
!     $connect_key ||= $self->CONFIG->{datasource} ||
!                      $R->CONFIG->{datasource}{default_connection_db};
!     return $R->db( $connect_key );
  }