[Openinteract-commits] CVS: OpenInteract/OpenInteract/SPOPS DBI.pm,1.6,1.7 LDAP.pm,1.9,1.10

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

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

Modified Files:
	DBI.pm LDAP.pm 
Log Message:
modify to reflect server configuration file changes


Index: DBI.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/SPOPS/DBI.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DBI.pm	2001/10/07 14:26:17	1.6
--- DBI.pm	2001/10/17 04:47:07	1.7
***************
*** 20,24 ****
      my ( $self, $connect_key ) = @_;
      my $R = OpenInteract::Request->instance;
!     $connect_key ||= $self->CONFIG->{datasource} || $R->CONFIG->{default_connection_db};
      $connect_key = $connect_key->[0] if ( ref $connect_key eq 'ARRAY' );
      return \%{ $self->CONFIG->{db_info}->{ $connect_key } };
--- 20,26 ----
      my ( $self, $connect_key ) = @_;
      my $R = OpenInteract::Request->instance;
!     $connect_key ||= $self->CONFIG->{datasource} ||
!                      $R->CONFIG->{datasource}{default_connection_db} ||
!                      $R->CONFIG->{default_connection_db};
      $connect_key = $connect_key->[0] if ( ref $connect_key eq 'ARRAY' );
      return \%{ $self->CONFIG->{db_info}->{ $connect_key } };

Index: LDAP.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract/OpenInteract/SPOPS/LDAP.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** LDAP.pm	2001/08/28 21:28:13	1.9
--- LDAP.pm	2001/10/17 04:47:07	1.10
***************
*** 51,58 ****
  sub get_connect_key {
      my ( $class ) = @_;
!     my $connect_key = $class->CONFIG->{datasource};
!     unless ( $connect_key ) {
!         $connect_key = $class->global_config->{default_connection_ldap};
!     }
      $connect_key = $connect_key->[0] if ( ref $connect_key eq 'ARRAY' );
      return $connect_key;
--- 51,57 ----
  sub get_connect_key {
      my ( $class ) = @_;
!     my $connect_key = $class->CONFIG->{datasource} ||
!                       $class->global_config->{datasource}{default_connection_ldap} ||
!                       $class->global_config->{default_connection_ldap};
      $connect_key = $connect_key->[0] if ( ref $connect_key eq 'ARRAY' );
      return $connect_key;