Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/DataStoreServer/scripts/dsprodtool

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• DataStoreServer/scripts/dsprodtool (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/DataStoreServer/scripts/dsprodtool

@@ -102 +102 @@
     if ($err);
 
-my $dbserver = metadataLookupStr($siteConfig, 'DBSERVER');
-$dbname      = metadataLookupStr($siteConfig, 'DBNAME') unless defined $dbname;
-my $dbuser   = metadataLookupStr($siteConfig, 'DBUSER');
-my $dbpass   = metadataLookupStr($siteConfig, 'DBPASSWORD');
+my $dbserver = metadataLookupStr($siteConfig, 'DS_DBSERVER');
+$dbname      = metadataLookupStr($siteConfig, 'DS_DBNAME')
+    unless defined $dbname;
+my $dbuser   = metadataLookupStr($siteConfig, 'DS_DBUSER');
+my $dbpass   = metadataLookupStr($siteConfig, 'DS_DBPASSWORD');
 exit ($PS_EXIT_CONFIG_ERROR) unless defined $dbserver and $dbname and $dbuser and $dbpass;