[Scoop-checkins] scoop/lib/Scoop DB.pm

[scoop at lithium.sabren.com]

Update of /cvs/scoop/scoop/lib/Scoop
In directory lithium.sabren.com:/tmp/cvs-serv31385/lib/Scoop

Modified Files:
	DB.pm 
Log Message:
In preparation for Scoop 1.2's eventual release, committing support for master and slave databases. -j


Index: DB.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/DB.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** DB.pm	6 Oct 2005 20:14:45 -0000	1.27
--- DB.pm	27 Apr 2006 03:52:48 -0000	1.28
***************
*** 29,36 ****
  	if ($args->{ARCHIVE}) {
  		$archive = 1;
! 		$dbh = $S->{DBHARCHIVE};
  	} else {
  		$archive = 0;
! 		$dbh = $S->{DBH};
  	}
  	return('0E0',undef) unless ($dbh);
--- 29,36 ----
  	if ($args->{ARCHIVE}) {
  		$archive = 1;
! 		$dbh = $S->get_archive_dbh(1);
  	} else {
  		$archive = 0;
! 		$dbh = $S->get_dbh(1);
  	}
  	return('0E0',undef) unless ($dbh);
***************
*** 180,186 ****
  	my $dbh;
  	if ($args->{ARCHIVE}) {
! 		$dbh = $S->{DBHARCHIVE};
  	} else {
! 		$dbh = $S->{DBH};
  	}
  	return('0E0',undef) unless ($dbh);
--- 180,186 ----
  	my $dbh;
  	if ($args->{ARCHIVE}) {
! 		$dbh = $S->get_archive_dbh;
  	} else {
! 		$dbh = $S->get_dbh;
  	}
  	return('0E0',undef) unless ($dbh);
***************
*** 216,222 ****
  
  	if ($args->{ARCHIVE}) {
! 		$dbh = $S->{DBHARCHIVE};
  	} else {
!   		$dbh = $S->{DBH};
  	}
  	return('0E0',undef) unless ($dbh);
--- 216,222 ----
  
  	if ($args->{ARCHIVE}) {
! 		$dbh = $S->get_archive_dbh;
  	} else {
!   		$dbh = $S->get_dbh;
  	}
  	return('0E0',undef) unless ($dbh);
***************
*** 254,260 ****
  	my $dbh;
  	if ($args->{ARCHIVE}) {
! 		$dbh = $S->{DBHARCHIVE};
  	} else {
!   		$dbh = $S->{DBH};
  	}
  	return('0E0',undef) unless ($dbh);
--- 254,260 ----
  	my $dbh;
  	if ($args->{ARCHIVE}) {
! 		$dbh = $S->get_archive_dbh;
  	} else {
!   		$dbh = $S->get_dbh;
  	}
  	return('0E0',undef) unless ($dbh);
***************
*** 285,291 ****
  	my $dbh;
  	if ($args->{ARCHIVE}) {
! 		$dbh = $S->{DBHARCHIVE};
  	} else {
!   		$dbh = $S->{DBH};
  	}
  	return('0E0',undef) unless ($dbh);
--- 285,291 ----
  	my $dbh;
  	if ($args->{ARCHIVE}) {
! 		$dbh = $S->get_archive_dbh;
  	} else {
!   		$dbh = $S->get_dbh;
  	}
  	return('0E0',undef) unless ($dbh);
***************
*** 325,331 ****
  	my $dbh;
  	if ($args->{ARCHIVE}) {
! 		$dbh = $S->{DBHARCHIVE};
  	} else {
!   		$dbh = $S->{DBH};
  	}
  	return('0E0',undef) unless ($dbh);
--- 325,331 ----
  	my $dbh;
  	if ($args->{ARCHIVE}) {
! 		$dbh = $S->get_archive_dbh;
  	} else {
!   		$dbh = $S->get_dbh;
  	}
  	return('0E0',undef) unless ($dbh);
***************
*** 356,362 ****
          my $dbh;
          if ($args->{ARCHIVE}) {
!                 $dbh = $S->{DBHARCHIVE};
          } else {
!                 $dbh = $S->{DBH};
          }
          return('0E0',undef) unless ($dbh);
--- 356,362 ----
          my $dbh;
          if ($args->{ARCHIVE}) {
!                 $dbh = $S->get_archive_dbh;
          } else {
!                 $dbh = $S->get_dbh;
          }
          return('0E0',undef) unless ($dbh);
***************
*** 384,390 ****
          my $dbh;
          if ($args->{ARCHIVE}) {
!                 $dbh = $S->{DBHARCHIVE};
          } else {
!                 $dbh = $S->{DBH};
          }
          return('0E0',undef) unless ($dbh);
--- 384,390 ----
          my $dbh;
          if ($args->{ARCHIVE}) {
!                 $dbh = $S->get_archive_dbh;
          } else {
!                 $dbh = $S->get_dbh;
          }
          return('0E0',undef) unless ($dbh);
***************
*** 412,418 ****
          my $dbh;
          if ($args->{ARCHIVE}) {
!                 $dbh = $S->{DBHARCHIVE};
          } else {
!                 $dbh = $S->{DBH};
          }
          return('0E0',undef) unless ($dbh);
--- 412,418 ----
          my $dbh;
          if ($args->{ARCHIVE}) {
!                 $dbh = $S->get_archive_dbh;
          } else {
!                 $dbh = $S->get_dbh;
          }
          return('0E0',undef) unless ($dbh);