Changeset 19092 for trunk/ippTools/src/pxcam.c

Timestamp:

Aug 16, 2008, 1:27:58 PM (18 years ago)

Author:

eugene

Message:

extensive changes from eam_branch_20080719:

• added the 'cleanup' options to camtool, faketool, warptool, difftool, stacktool
• added corresponding sql code
• changed the states for camera, fake, warp, diff, and stack to the new set of states: new, full, goto_cleaned, cleaned, update, goto_purged, and purged
• added 'data_state' entries to the detrend tables and the detRunSummary
• added 'cleanup' options to dettool using the detRunSummary data_state as the control
• moved dettool supporting code to dettool_STAGE, where stage is processedimfile, processedexp, etc.
• converted dettool to use S64 for det_id and exp_id entries

File:

• trunk/ippTools/src/pxcam.c (modified) (4 diffs)

trunk/ippTools/src/pxcam.c

@@ -35 +35 @@
 
     // check that state is a valid string value
-    if (!(
-            (strncmp(state, "run", 4) == 0)
-            || (strncmp(state, "stop", 5) == 0)
-            || (strncmp(state, "reg", 4) == 0)
-        )
-    ) {
+    if (!pxIsValidState(state)) {
         psError(PS_ERR_UNKNOWN, false,
                 "invalid camRun state: %s", state);
@@ -63 +58 @@
 
     // check that state is a valid string value
-    if (!(
-            (strncmp(state, "run", 4) == 0)
-            || (strncmp(state, "stop", 5) == 0)
-            || (strncmp(state, "reg", 4) == 0)
-        )
-    ) {
+    if (!pxIsValidState(state)) {
         psError(PS_ERR_UNKNOWN, false,
                 "invalid chipRun state: %s", state);
@@ -108 +98 @@
     return true;
 }
-
 
 bool pxcamRunSetLabelByQuery(pxConfig *config, psMetadata *where, const char *label)
@@ -162 +151 @@
     // different on 32/64
     if (!p_psDBRunQuery(config->dbh, query,
-                "run", // state
+                "new", // state
                 workdir  ? workdir  : "NULL",
                 "dirty", //workdir_state