Changeset 25027 for branches/pap/DataStoreServer/scripts/dsprodtool

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

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

branches/pap/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;