Changeset 9821

Timestamp:

Nov 1, 2006, 12:27:41 PM (20 years ago)

Author:

jhoblitt

Message:

remove dettool -updatedetrun -stop
add dettool -upratedetrun -state ...

Location:

trunk

Files:

• ippScripts/scripts/detrend_reject_exp.pl (modified) (1 diff)
• ippTools/scripts/dettest.sh (modified) (1 diff)
• ippTools/src/dettool.c (modified) (3 diffs)
• ippTools/src/dettoolConfig.c (modified) (1 diff)

trunk/ippScripts/scripts/detrend_reject_exp.pl

@@ -188 +188 @@
     my $command = "$dettool -updatedetrun -det_id $det_id";
     if ($stop) {
-        $command .= ' -stop';
+        $command .= ' -state stop';
     } else {
         $command .= ' -again';

trunk/ippTools/scripts/dettest.sh

@@ -61 +61 @@
 dettool -residexp || exit 1
 
-dettool -updatedetrun -det_id $det_id -stop || exit 1
+dettool -updatedetrun -det_id $det_id -state stop || exit 1

trunk/ippTools/src/dettool.c

@@ -4285 +4285 @@
         return false;
     }
-    // either -rerun or -stop must be specified
+    // either -rerun or -state must be specified
     bool again = psMetadataLookupBool(&status, config->args, "-again");
     if (!status) {
@@ -4291 +4291 @@
         return false;
     }
-    bool stop = psMetadataLookupBool(&status, config->args, "-stop");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -stop");
-        return false;
-    }
-    if (!(again || stop)) {
-        psError(PS_ERR_UNKNOWN, true, "either -again or -stop must be specified");
-        return false;
-    }
-    if (again && stop) {
-        psError(PS_ERR_UNKNOWN, true, "either -again or -stop must be specified");
-        return false;
-    }
-
-    if (stop) {
-        // set detRun.state to stop
-        return setDetRunState(config, det_id, "stop");
+    psString state = psMetadataLookupStr(&status, config->args, "-state");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -state");
+        return false;
+    }
+    if (!(again || state)) {
+        psError(PS_ERR_UNKNOWN, true, "either -again or -state must be specified");
+        return false;
+    }
+    if (again && state) {
+        psError(PS_ERR_UNKNOWN, true, "either -again or -state must be specified");
+        return false;
+    }
+
+    if (state) {
+        // set detRun.state to state
+        return setDetRunState(config, det_id, state);
     }
 
@@ -4926 +4926 @@
     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 detRun state: %s", state);
+        return false;
+    }
+
     char *query = "UPDATE detRun SET state = '%s' WHERE det_id = '%s'";
     if (!p_psDBRunQuery(config->dbh, query, state, det_id)) {

trunk/ippTools/src/dettoolConfig.c

@@ -509 +509 @@
     psMetadataAddBool(updatedetrunArgs, PS_LIST_TAIL, "-again",  0,
         "start a new iteration of this detrend run", false);
-    psMetadataAddBool(updatedetrunArgs, PS_LIST_TAIL, "-stop",  0,
-        "stop this detrend run", false);
+    psMetadataAddStr(updatedetrunArgs, PS_LIST_TAIL, "-state",  0,
+        "set the state of this detrend run", false);
 
     // -rerun