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

branches/eam_branch_20080719/ippTools/src/dettool_residimfile.c

@@ -76 +76 @@
 
     
-    PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false); // required
+    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_STR(class_id, config->args, "-class_id", true, false); // required
     PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
@@ -102 +102 @@
     PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false);
 
-    if (!detResidImfileInsert(config->dbh,
-            (psS64)atoll(det_id),
+    if (!detResidImfileInsert(
+            config->dbh,
+            det_id,
             iteration,
-            (psS64)atoll(exp_id),
+            exp_id,
             class_id,
             uri,
@@ -127 +128 @@
             user_5,
             path_base,
+            "full",
             code
     )) {
@@ -142 +144 @@
 
     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, "-class_id",   "class_id", "==");
     PXOPT_COPY_STR(config->args, where, "-recip",      "recipe", "==");
@@ -225 +227 @@
 
     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, "-class_id",  "class_id", "==");
     PXOPT_COPY_S16(config->args, where, "-code",      "fault", "==");
@@ -259 +261 @@
 }
 
+bool updateresidimfileMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+
+    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
+    PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", true, false);
+    PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false);
+    PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
+    PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
+    if (!setResidImfileDataState(config, det_id, iteration, exp_id, class_id, data_state)) {
+        return false;
+    }
+    return true;
+}
+
 bool pendingcleanup_residimfileMode(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", "detProcessedImfile.det_id", "==");
 
     psString query = pxDataGet("dettool_pendingcleanup_residimfile.sql");
@@ -312 +325 @@
 
     // negative simple so the default is true
-    if (!ippdbPrintMetadatas(stdout, output, "detPendingCleanup_residimfile", !simple)) {
+    if (!ippdbPrintMetadatas(stdout, output, "detCleanupResidImfile", !simple)) {
         psError(PS_ERR_UNKNOWN, false, "failed to print array");
         psFree(output);