Changeset 6297

Timestamp:

Feb 1, 2006, 6:51:14 PM (20 years ago)

Author:

desonia

Message:

Bug 678 patch applied - psModule can't be built against a pslib built without psdb support

Location:

trunk/psModules/src/config

Files:

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

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-12-12 20:11:06 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-02 04:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -424 +424 @@
  *****************************************************************************/
 
+#ifdef OMIT_PSDB
+psDB *pmConfigDB(psMetadata *site)
+{
+    psError(PS_ERR_UNKNOWN, true, "pslib was built without psDB support");
+    return NULL;
+}
+#else
 psDB *pmConfigDB(
     psMetadata *site)
@@ -435 +442 @@
     psString dbUsername = psMetadataLookupStr(&mdStatus02, site, "DBUSER");
     psString dbPassword = psMetadataLookupStr(&mdStatus03, site, "DBPASSWORD");
+    psString dbName = psMetadataLookupStr(&mdStatus01, site, "DBNAME");
+
     if (!(mdStatus01 & mdStatus02 & mdStatus03)) {
         psLogMsg(__func__, PS_LOG_WARN, "Could not determine database server name, userID, and password from site metadata.\n");
-        return(NULL);
-    }
-
-    return(psDBInit(dbServer, dbUsername, dbPassword, NULL));
-}
+        return NULL;
+    }
+
+    dbh = psDBInit(dbServer, dbUsername, dbPassword, dbName);
+    psFree(dbServer);
+    psFree(dbUsername);
+    psFree(dbPassword);
+    psFree(dbName);
+
+    if (!dbh) {
+        psError(PS_ERR_UNKNOWN, false, "database connection failed");
+    }
+
+    return dbh;
+}
+#endif

trunk/psModules/src/config/pmConfig.h

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-20 23:06:24 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-02 04:51:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -91 +91 @@
  * 
  */
+#ifdef DOMIT_PSDB
+typedef psDB void;
+#endif
+
 psDB *pmConfigDB(
     psMetadata *site