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

branches/eam_branch_20080719/ippTools/src/dettool_stack.c

@@ -78 +78 @@
 
     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", "==");
 
@@ -123 +123 @@
 
     // det_id, iteration, class_id, uri, & recipe are required
-    PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false);
+    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", true, false);
     PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
@@ -175 +175 @@
     // create a new detStackedImfile object
     detStackedImfileRow *stackedImfile = detStackedImfileRowAlloc(
-            (psS64)atoll(det_id),
+            det_id,
             iteration,
             class_id,
@@ -208 +208 @@
 
     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, "-class_id",  "class_id", "==");
@@ -282 +282 @@
 
     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, "-class_id",  "class_id", "==");
@@ -315 +315 @@
 }
 
+bool updatestackedMode(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_STR(data_state, config->args, "-data_state", true, false);
+
+    if (!setStackedImfileDataState(config, det_id, iteration, data_state)) {
+        return false;
+    }
+    return true;
+}
+
 bool pendingcleanup_stackedMode(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", "detStackedImfile.det_id", "==");
+    PXOPT_COPY_S32(config->args, where, "-iteration", "detStackedImfile.iteration", "==");
 
     psString query = pxDataGet("dettool_pendingcleanup_stacked.sql");
@@ -368 +379 @@
 
     // negative simple so the default is true
-    if (!ippdbPrintMetadatas(stdout, output, "detPendingCleanup_stacked", !simple)) {
+    if (!ippdbPrintMetadatas(stdout, output, "detCleanupStackedImfile", !simple)) {
         psError(PS_ERR_UNKNOWN, false, "failed to print array");
         psFree(output);
@@ -379 +390 @@
 }
 
-
+// XXX SQL missing
 bool donecleanup_stackedMode(pxConfig *config)
 {