Changeset 9232 for trunk/ippTools/src/regtool.c

Timestamp:

Oct 4, 2006, 12:36:22 PM (20 years ago)

Author:

jhoblitt

Message:

improved database error handling

File:

• trunk/ippTools/src/regtool.c (modified) (6 diffs)

trunk/ippTools/src/regtool.c

@@ -71 +71 @@
     char *query =
         "SELECT newExp.*"
-        "   FROM newExp"
+        " FROM newExp"
         " LEFT JOIN newImfile USING(exp_tag)"
         " LEFT JOIN rawScienceExp USING(exp_tag)"
@@ -91 +91 @@
     psArray *output = p_psDBFetchResult(config->dbh);
     if (!output) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+    if (!psArrayLength(output)) {
         // XXX check psError here
-        psError(PS_ERR_UNKNOWN, false, "failed to fetch the database result");
-        return false;
+        psError(PS_ERR_UNKNOWN, false, "no pending newExp rows found");
+        psFree(output);
+        return true;
     }
 
@@ -144 +149 @@
     psArray *output = p_psDBFetchResult(config->dbh);
     if (!output) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+    if (!psArrayLength(output)) {
         // XXX check psError here
-        psError(PS_ERR_UNKNOWN, false, "failed to fetch the database result");
-        return false;
+        psError(PS_ERR_UNKNOWN, false, "no pending newImfile rows found");
+        psFree(output);
+        return true;
     }
 
@@ -183 +193 @@
     psString query = psStringCopy(
         "SELECT newExp.*"
-        "   FROM newExp"
+        " FROM newExp"
         " LEFT JOIN newImfile USING(exp_tag)"
         " LEFT JOIN rawScienceExp USING(exp_tag)"
@@ -218 +228 @@
     psArray *output = p_psDBFetchResult(config->dbh);
     if (!output) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+    if (!psArrayLength(output)) {
         // XXX check psError here
-        psError(PS_ERR_UNKNOWN, false, "failed to fetch the database result");
+        psError(PS_ERR_UNKNOWN, false, "no pending newExp rows found");
+        psFree(output);
         return false;
     }
@@ -510 +525 @@
     psFree(query);
 
-    psArray *newImfiles = p_psDBFetchResult(config->dbh);
-    if (!newImfiles) {
+    psArray *output = p_psDBFetchResult(config->dbh);
+    if (!output) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+    if (!psArrayLength(output)) {
         // XXX check psError here
-        psError(PS_ERR_UNKNOWN, false, "failed to fetch the database result");
+        psError(PS_ERR_UNKNOWN, false, "no pending newImfile rows found");
+        psFree(output);
         return false;
     }