Changeset 7026

Timestamp:

May 1, 2006, 2:47:01 PM (20 years ago)

Author:

Paul Price

Message:

Passing in configuration, rather than site configuration to psConfigDB

Location:

trunk/psModules/src/config

Files:

• pmConfig.c (modified) (4 diffs)
• pmConfig.h (modified) (2 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-01 01:08:45 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-02 00:47:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -559 +559 @@
 
 psDB *pmConfigDB(
-    psMetadata *site)
+    pmConfig *config                    // Configuration
+)
 {
     #ifdef OMIT_PSDB
@@ -565 +566 @@
     #else
 
-    PS_ASSERT_PTR_NON_NULL(site, NULL);
+    PS_ASSERT_PTR_NON_NULL(config->site, NULL);
     psBool mdStatus01 = false;
     psBool mdStatus02 = false;
@@ -571 +572 @@
 
     // XXX leaky strings
-    psString dbServer = psMetadataLookupStr(&mdStatus01, site, "DBSERVER");
-    psString dbUsername = psMetadataLookupStr(&mdStatus02, site, "DBUSER");
-    psString dbPassword = psMetadataLookupStr(&mdStatus03, site, "DBPASSWORD");
-    psString dbName = psMetadataLookupStr(&mdStatus01, site, "DBNAME");
+    psString dbServer = psMetadataLookupStr(&mdStatus01, config->site, "DBSERVER");
+    psString dbUsername = psMetadataLookupStr(&mdStatus02, config->site, "DBUSER");
+    psString dbPassword = psMetadataLookupStr(&mdStatus03, config->site, "DBPASSWORD");
+    psString dbName = psMetadataLookupStr(&mdStatus01, config->site, "DBNAME");
     if (!(mdStatus01 & mdStatus02 & mdStatus03)) {
         psLogMsg(__func__, PS_LOG_WARN, "Could not determine database server name, userID, and password from site metadata.\n");

trunk/psModules/src/config/pmConfig.h

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-22 03:20:16 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-02 00:47:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -103 +103 @@
  */
 psDB *pmConfigDB(
-    psMetadata *site
+    pmConfig *config                    // Configuration
 );