Changeset 18991 for branches/eam_branch_20080719/ippTools/src/dettool_processedexp.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_processedexp.c (modified) (9 diffs)

branches/eam_branch_20080719/ippTools/src/dettool_processedexp.c

@@ -76 +76 @@
     // det_id, exp_id, recip, -bg, -bg_stdev
     // are required
-    PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false);
-    PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false);
+    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
+    PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false);
 
     // default values
@@ -126 +126 @@
     // create a new detProcessedImfile object
     detProcessedExpRow *detRow = detProcessedExpRowAlloc(
-        (psS64)atoll(det_id),
-        (psS64)atoll(exp_id),
+        det_id,
+        exp_id,
         recipe,
         bg,
@@ -141 +141 @@
         user_5,
         path_base,
+        "full",
         code
     );
@@ -161 +162 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -228 +229 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_STR(config->args, where, "-det_id", "det_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-exp_id", "exp_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
     PXOPT_COPY_S16(config->args, where, "-code",   "fault", "==");
 
@@ -260 +261 @@
 }
 
+bool updateprocessedexpMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+
+    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
+    PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false);
+    PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
+    if (!setProcessedExpDataState(config, det_id, exp_id, data_state)) {
+        return false;
+    }
+    return true;
+}
+
 bool pendingcleanup_processedexpMode(pxConfig *config)
 {
     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", "detProcessedExp.det_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "detProcessedExp.label", "==");
 
     psString query = pxDataGet("dettool_pendingcleanup_processedexp.sql");
@@ -313 +324 @@
 
     // negative simple so the default is true
-    if (!ippdbPrintMetadatas(stdout, output, "detPendingCleanup_processedexp", !simple)) {
+    if (!ippdbPrintMetadatas(stdout, output, "detCleanupProcessedExp", !simple)) {
         psError(PS_ERR_UNKNOWN, false, "failed to print array");
         psFree(output);
@@ -324 +335 @@
 }
 
-
+// XXX SQL missing
 bool donecleanup_processedexpMode(pxConfig *config)
 {
@@ -374 +385 @@
 
     // negative simple so the default is true
-    if (!ippdbPrintMetadatas(stdout, output, "detDoneCleanup_processedexp", !simple)) {
+    if (!ippdbPrintMetadatas(stdout, output, "detDoneCleanupProcessedExp", !simple)) {
         psError(PS_ERR_UNKNOWN, false, "failed to print array");
         psFree(output);