Changeset 25800 for trunk/ippTools/src/stacktool.c

Timestamp:

Oct 7, 2009, 4:25:35 PM (17 years ago)

Author:

watersc1

Message:

Updates to various tools to fix errors in cleanup.

File:

• trunk/ippTools/src/stacktool.c (modified) (3 diffs)

trunk/ippTools/src/stacktool.c

@@ -48 +48 @@
 
 static bool setstackRunState(pxConfig *config, psS64 stack_id, const char *state);
+static bool setstackRunStateByLabel(pxConfig *config, const char *label, const char *state);
 
 # define MODECASE(caseName, func) \
@@ -569 +570 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false);
+    PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", false, false);
     PXOPT_LOOKUP_STR(state, config->args, "-state", true, false);
-
-    if (state) {
+    PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
+
+    // Hack-y work around to make stacktool more like the other tools, without breaking other stuff (hopefully).
+
+    if ((state)&&(stack_id)) {
         // set detRun.state to state
         return setstackRunState(config, stack_id, state);
     }
 
-    return true;
+    if ((state)&&(label)) {
+      return setstackRunStateByLabel(config, label, state);
+    }
+
+    psError(PS_ERR_UNKNOWN, false, "Required options not found.");
+    return false;
 }
 
@@ -1006 +1015 @@
 }
 
+static bool setstackRunStateByLabel(pxConfig *config, const char *label, const char *state)
+{
+    PS_ASSERT_PTR_NON_NULL(state, false);
+
+    // check that state is a valid string value
+    if (!pxIsValidState(state)) {
+        psError(PS_ERR_UNKNOWN, false, "invalid stackRun state: %s", state);
+        return false;
+    }
+
+    char *query = "UPDATE stackRun SET state = '%s' WHERE label = '%s'";
+    if (!p_psDBRunQueryF(config->dbh, query, state, label)) {
+        psError(PS_ERR_UNKNOWN, false,
+                "failed to change state for label %s", label);
+        return false;
+    }
+
+    return true;
+}
+
 static bool pendingcleanuprunMode(pxConfig *config)
 {