Changeset 4279 for trunk/psLib/src/dataIO/psDB.c

Timestamp:

Jun 15, 2005, 3:48:18 PM (21 years ago)

Author:

evanalst

Message:

Update function psDBSelectColumn to handle invalid parameters.

File:

• trunk/psLib/src/dataIO/psDB.c (modified) (5 diffs)

trunk/psLib/src/dataIO/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-15 19:52:21 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-16 01:48:18 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -255 +255 @@
     psPtr           data;               // copy of result field
 
+    // Generate SQL query string
     query = psDBGenerateSelectRowSQL(tableName, col, NULL, limit);
     if (!query) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Query generation failed.");
+        psError(PS_ERR_UNEXPECTED_NULL, false, PS_ERRORTEXT_psDB_QUERY_GEN_FAIL);
         return NULL;
     }
 
+    // Execut SQL query string
     if (!p_psDBRunQuery(dbh, query)) {
-        psError(PS_ERR_UNKNOWN, false, "Query execution failed.");
+        psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psDB_SEL_COL_FAIL);
         psFree(query);
         return NULL;
     }
-
     psFree(query);
 
+    // Obtain query result and check for no data condition
     result = mysql_store_result(dbh->mysql);
+
     if (!result) {
         // no result set
@@ -277 +280 @@
         // then something bad has happened.
         if (fieldCount != 0) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, "Query returned no data.  Error: %s", mysql_error(dbh->mysql));
+            psError(PS_ERR_UNEXPECTED_NULL, true, PS_ERRORTEXT_psDB_QUERY_NO_DATA,
+                    mysql_error(dbh->mysql));
             return NULL;
         }
     }
 
+    // Get number of rows returned in result
     rowCount = mysql_num_rows(result);
 
@@ -290 +295 @@
     column->n = 0;
 
+    // Fetch each result
     while ((row = mysql_fetch_row(result))) {
         // get the first element of lengths array that is part of the
@@ -309 +315 @@
     }
 
+    // Clean up mysql memory
     mysql_free_result(result);