Changeset 18659 for branches/eam_branch_20080719/ippTools/src/stacktool.c

Timestamp:

Jul 22, 2008, 9:10:30 AM (18 years ago)

Author:

eugene

Message:

changing state from old values (run, stop) to new set (new, full, cleaned, etc); using pxIsValidState where possible

File:

• branches/eam_branch_20080719/ippTools/src/stacktool.c (modified) (4 diffs)

branches/eam_branch_20080719/ippTools/src/stacktool.c

@@ -278 +278 @@
 
         // create a new stackRun for this stack
-        stackRunRow *run = stackRunRowAlloc(0, "run", workdir, NULL, registered, skycell_id, tess_id, filter);
+        stackRunRow *run = stackRunRowAlloc(
+            0,                          // ID
+            "new",                      // state
+            workdir, 
+            NULL,                       // workdir_state
+            registered, 
+            skycell_id, 
+            tess_id, 
+            filter);
+
         if (!stackRunInsertObject(config->dbh, run)) {
             if (!psDBRollback(config->dbh)) {
@@ -363 +372 @@
     }
 
-    stackRunRow *run = stackRunRowAlloc(0, "run", workdir, NULL, registered, skycell_id, tess_id, filter);
+    stackRunRow *run = stackRunRowAlloc(
+        0,                              // ID
+        "new",                          // state
+        workdir, 
+        NULL,                           // workdir_state
+        registered, 
+        skycell_id, 
+        tess_id, 
+        filter);
+
     if (!run) {
         psError(PS_ERR_UNKNOWN, false, "failed to alloc stackRun object");
@@ -656 +674 @@
     }
 
-    if (!setstackRunState(config, stack_id, "stop")) {
+    if (!setstackRunState(config, stack_id, "full")) {
         if (!psDBRollback(config->dbh)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
@@ -788 +806 @@
 
     // 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 warpRun state: %s", state);
+    if (!pxIsValidState(state)) {
+        psError(PS_ERR_UNKNOWN, false, "invalid stackRun state: %s", state);
         return false;
     }