Changeset 4256

Timestamp:

Jun 14, 2005, 3:01:08 PM (21 years ago)

Author:

evanalst

Message:

Update function psDBInit and psDBCleanup to handle error conditions.

Location:

trunk/psLib/src

Files:

• dataIO/psDB.c (modified) (4 diffs)
• dataIO/psFileUtilsErrors.dat (modified) (1 diff)
• dataIO/psFileUtilsErrors.h (modified) (2 diffs)
• db/psDB.c (modified) (4 diffs)

trunk/psLib/src/dataIO/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-07 02:29:44 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-15 01:01:08 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -35 +35 @@
 #include "psError.h"
 #include "psString.h"
-
+#include "psFileUtilsErrors.h"
 
 typedef struct
@@ -99 +99 @@
     }
 
+    // Connect to host and mySql server with specified database
     if (!mysql_real_connect(mysql, host, user, passwd, dbname, 0, NULL, 0)) {
-        psError(PS_ERR_UNKNOWN, true, "Failed to connect to database.  Error: %s", mysql_error(mysql));
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psDB_FAILED_TO_CONNECT,mysql_error(mysql));
 
         mysql_close(mysql);
@@ -116 +118 @@
 void psDBCleanup(psDB *dbh)
 {
-    mysql_close(dbh->mysql);
-    dbh->mysql = NULL;
-    psFree(dbh);
-
-    // ASC WARNING NOTE: the psDBSQLToPTypeTableCleanup cleanup routine
-    // needs to be called first because it refers to
-    // psDBGetPTypeToSQLTable ...
-    psDBSQLToPTypeTableCleanup();
-    psDBMySQLToSQLTableCleanup();
-    psDBPTypeToSQLTableCleanup();
-    psDBPTypeToMySQLTableCleanup();
+    // Check if argument dbh is NULL
+    if(dbh == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psDB_INVALID_PSDB);
+    } else {
+
+        // Attempt to close specified database connection
+        mysql_close(dbh->mysql);
+        dbh->mysql = NULL;
+        psFree(dbh);
+
+        // ASC WARNING NOTE: the psDBSQLToPTypeTableCleanup cleanup routine
+        // needs to be called first because it refers to
+        // psDBGetPTypeToSQLTable ...
+        psDBSQLToPTypeTableCleanup();
+        psDBMySQLToSQLTableCleanup();
+        psDBPTypeToSQLTableCleanup();
+        psDBPTypeToMySQLTableCleanup();
+    }
 }
 

trunk/psLib/src/dataIO/psFileUtilsErrors.dat

@@ -57 +57 @@
 psFits_FITS_Z_SMALL                    Current FITS HDU has %d z-planes, but z-plane %d was specified.
 #
+psDB_INVALID_PSDB                      Invalid psDB has been specified.
+psDB_FAILED_TO_CONNECT                 Failed to connect to database.  Error: %s
+#
+

trunk/psLib/src/dataIO/psFileUtilsErrors.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-15 01:01:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -76 +76 @@
 #define PS_ERRORTEXT_psFits_IMAGE_UPDATE_TYPE_MISMATCH "Can not update a %s image given a %s image."
 #define PS_ERRORTEXT_psFits_FITS_Z_SMALL "Current FITS HDU has %d z-planes, but z-plane %d was specified."
+#define PS_ERRORTEXT_psDB_INVALID_PSDB "Invalid psDB has been specified."
+#define PS_ERRORTEXT_psDB_FAILED_TO_CONNECT "Failed to connect to database.  Error: %s"
 //~End
 

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-07 02:29:44 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-15 01:01:08 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -35 +35 @@
 #include "psError.h"
 #include "psString.h"
-
+#include "psFileUtilsErrors.h"
 
 typedef struct
@@ -99 +99 @@
     }
 
+    // Connect to host and mySql server with specified database
     if (!mysql_real_connect(mysql, host, user, passwd, dbname, 0, NULL, 0)) {
-        psError(PS_ERR_UNKNOWN, true, "Failed to connect to database.  Error: %s", mysql_error(mysql));
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psDB_FAILED_TO_CONNECT,mysql_error(mysql));
 
         mysql_close(mysql);
@@ -116 +118 @@
 void psDBCleanup(psDB *dbh)
 {
-    mysql_close(dbh->mysql);
-    dbh->mysql = NULL;
-    psFree(dbh);
-
-    // ASC WARNING NOTE: the psDBSQLToPTypeTableCleanup cleanup routine
-    // needs to be called first because it refers to
-    // psDBGetPTypeToSQLTable ...
-    psDBSQLToPTypeTableCleanup();
-    psDBMySQLToSQLTableCleanup();
-    psDBPTypeToSQLTableCleanup();
-    psDBPTypeToMySQLTableCleanup();
+    // Check if argument dbh is NULL
+    if(dbh == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psDB_INVALID_PSDB);
+    } else {
+
+        // Attempt to close specified database connection
+        mysql_close(dbh->mysql);
+        dbh->mysql = NULL;
+        psFree(dbh);
+
+        // ASC WARNING NOTE: the psDBSQLToPTypeTableCleanup cleanup routine
+        // needs to be called first because it refers to
+        // psDBGetPTypeToSQLTable ...
+        psDBSQLToPTypeTableCleanup();
+        psDBMySQLToSQLTableCleanup();
+        psDBPTypeToSQLTableCleanup();
+        psDBPTypeToMySQLTableCleanup();
+    }
 }