Changeset 9416

Timestamp:

Oct 9, 2006, 11:27:39 AM (20 years ago)

Author:

jhoblitt

Message:

add port argument to psDBInit()

Location:

trunk

Files:

• psLib/src/db/psDB.c (modified) (3 diffs)
• psLib/src/db/psDB.h (modified) (2 diffs)
• psModules/src/config/pmConfig.c (modified) (3 diffs)

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.98 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-07 23:36:20 $
+ *  @version $Revision: 1.99 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-09 21:27:11 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -127 +127 @@
                const char *user,
                const char *passwd,
-               const char *dbname)
+               const char *dbname,
+               unsigned int port)
 {
     MYSQL           *mysql;
@@ -141 +142 @@
 
     // Connect to host and mySql server with specified database
-    if (!mysql_real_connect(mysql, host, user, passwd, dbname, 0, NULL, 0)) {
+    if (!mysql_real_connect(mysql, host, user, passwd, dbname, port, NULL, 0)) {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
                 _("Failed to connect to database.  Error: %s"),mysql_error(mysql));

trunk/psLib/src/db/psDB.h

@@ -10 +10 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-26 00:32:39 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-09 21:27:11 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -47 +47 @@
     const char *user,                  ///< Database username
     const char *passwd,                ///< Database password
-    const char *dbname                 ///< Database namespace
+    const char *dbname,                ///< Database namespace
+    unsigned int port                  ///< Database port number
 );
 

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-09 20:18:58 $
+ *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-09 21:27:39 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -866 +866 @@
     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)) {
         psLogMsg(__func__, PS_LOG_WARN, "Could not determine database server name, userID, and password from site metadata.\n");
@@ -871 +872 @@
     }
 
-    return(psDBInit(dbServer, dbUsername, dbPassword, dbName));
+    return(psDBInit(dbServer, dbUsername, dbPassword, dbName, dbPort));
     #endif
 }