Changeset 9435

Timestamp:

Oct 9, 2006, 3:03:13 PM (20 years ago)

Author:

magnier

Message:

adding independent tests for missing dbname, default value (0) for dbport

File:

• trunk/psModules/src/config/pmConfig.c (modified) (3 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-09 21:27:39 $
+ *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-10 01:03:13 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -860 +860 @@
     psBool mdStatus02 = false;
     psBool mdStatus03 = false;
+    psBool mdStatus04 = false;
+    psBool mdStatus05 = false;
 
     // XXX leaky strings
@@ -865 +867 @@
     psString dbUsername = psMetadataLookupStr(&mdStatus02, config->site, "DBUSER");
     psString dbPassword = psMetadataLookupStr(&mdStatus03, config->site, "DBPASSWORD");
-    psString dbName = psMetadataLookupStr(&mdStatus01, config->site, "DBNAME");
-    psS32 dbPort = psMetadataLookupS32(&mdStatus01, config->site, "DBPORT");
-    if (!(mdStatus01 & mdStatus02 & mdStatus03)) {
+    psString dbName = psMetadataLookupStr(&mdStatus04, config->site, "DBNAME");
+    psS32 dbPort = psMetadataLookupS32(&mdStatus05, config->site, "DBPORT");
+    if (!mdStatus05)
+        dbPort = 0;
+    if (!(mdStatus01 & mdStatus02 & mdStatus03 & mdStatus04)) {
         psLogMsg(__func__, PS_LOG_WARN, "Could not determine database server name, userID, and password from site metadata.\n");
         return(NULL);