Changeset 15606

Timestamp:

Nov 13, 2007, 11:19:41 AM (18 years ago)

Author:

jhoblitt

Message:

add setflatcorrpRunState()
add database rollbacks where appropriate

File:

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

trunk/ippTools/src/flatcorr.c

@@ -36 +36 @@
 static bool pendingMode(pxConfig *config);
 static bool updateMode(pxConfig *config);
+
+static bool setflatcorrpRunState(pxConfig *config, psS64 corr_id, const char *state);
 
 # define MODECASE(caseName, func) \
@@ -263 +265 @@
             label
         )) {
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
         psError(PS_ERR_UNKNOWN, false, "database error");
         return false;
@@ -276 +281 @@
         psS64 exp_id = psMetadataLookupS64(&status, md, "exp_id");
         if (!status) {
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for exp_id");
             psFree(output);
@@ -298 +306 @@
                 chip_id
             )) {
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
             psError(PS_ERR_UNKNOWN, false, "database error");
             return false;
@@ -305 +316 @@
     psFree(output);
 
+    // set the flatcorrRun to a state of 'run'
+    if (!setflatcorrpRunState(config, corr_id, "run")) {
+        if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+        }
+        psError(PS_ERR_UNKNOWN, false, "failed to set run state");
+        return false;
+    }
+
     if (!psDBCommit(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -326 +346 @@
     return false;
 }
+
+
+static bool setflatcorrpRunState(pxConfig *config, psS64 corr_id, const char *state)
+{
+    PS_ASSERT_PTR_NON_NULL(state, false);
+
+    // check that state is a valid string value
+    if (!(
+            (strncmp(state, "run", 4) == 0)
+            || (strncmp(state, "stop", 5) == 0)
+            || (strncmp(state, "reg", 4) == 0)
+        )
+    ) {
+        psError(PS_ERR_UNKNOWN, false, "invalid state: %s", state);
+        return false;
+    }
+
+    char *query = "UPDATE flatcorrpRun SET state = '%s' WHERE corr_id = %" PRId64;
+    if (!p_psDBRunQuery(config->dbh, query, state, corr_id)) {
+        psError(PS_ERR_UNKNOWN, false,
+                "failed to change state for corr_id %" PRId64, corr_id);
+        return false;
+    }
+
+    return true;
+}