Changeset 18991 for branches/eam_branch_20080719/ippTools/src/dettool_residexp.c

Timestamp:

Aug 8, 2008, 5:08:29 PM (18 years ago)

Author:

eugene

Message:

adding cleanup operations to dettool

File:

• branches/eam_branch_20080719/ippTools/src/dettool_residexp.c (modified) (9 diffs)

branches/eam_branch_20080719/ippTools/src/dettool_residexp.c

@@ -88 +88 @@
     // limit search by det_id, iteration, exp_id
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "==");
     PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
-    PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "==");
-
-    PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); // required
+    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
+
+    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false); // required
     PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false);
-    PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false); // required
+    PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false); // required
     PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
     PXOPT_LOOKUP_STR(recipe, config->args, "-recip", (code == 0), false); // Required if code == 0
@@ -150 +150 @@
     psFree(output);
 
-    if (!detResidExpInsert(config->dbh,
-            (psS64)atoll(det_id),
+    if (!detResidExpInsert(
+            config->dbh,
+            det_id,
             iteration,
-            (psS64)atoll(exp_id),
+            exp_id,
             recipe,
             bg,
@@ -173 +174 @@
             user_5,
             path_base,
+            "full",
             !reject,
             code
@@ -188 +190 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_STR(config->args, where, "-det_id",    "det_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-det_id",    "det_id", "==");
     PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
-    PXOPT_COPY_STR(config->args, where, "-exp_id",    "exp_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-exp_id",    "exp_id", "==");
     PXOPT_COPY_STR(config->args, where, "-recip",     "recipe", "==");
 
@@ -268 +270 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_STR(config->args, where, "-det_id",    "det_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-det_id",    "det_id", "==");
     PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
-    PXOPT_COPY_STR(config->args, where, "-exp_id",    "exp_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-exp_id",    "exp_id", "==");
     PXOPT_COPY_S16(config->args, where, "-code",      "fault", "==");
 
@@ -310 +312 @@
     // build a query to search by det_id, iteration, exp_id
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "==");
     PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
-    PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
 
     // find the values we're going to set
@@ -323 +325 @@
     PXOPT_COPY_F64(config->args, set, "-bg_mean_stdev", "bg_mean_stdev", "==");
     PXOPT_COPY_STR(config->args, set, "-path_base", "path_base", "==");
+    PXOPT_COPY_STR(config->args, set, "-data_state", "data_state", "==");
+
+    // double-check the allowed data_state values
+    PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", false, false);
+    if (data_state) {
+        if (!isValidDataState (data_state)) return false;
+    }
 
     // this can't be PXOPT_ macro-ized as reject is !'d
@@ -348 +357 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
     psMetadata *where = psMetadataAlloc();
-    if (chip_id) {
-        PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "==");
-    }
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    PXOPT_COPY_S64(config->args, where, "-det_id", "detProcessedImfile.det_id", "==");
 
     psString query = pxDataGet("dettool_pendingcleanup_residexp.sql");
@@ -397 +402 @@
 
     // negative simple so the default is true
-    if (!ippdbPrintMetadatas(stdout, output, "detPendingCleanup_residexp", !simple)) {
+    if (!ippdbPrintMetadatas(stdout, output, "detCleanupResidExp", !simple)) {
         psError(PS_ERR_UNKNOWN, false, "failed to print array");
         psFree(output);