Changeset 27838 for branches/tap_branches/ippTools/src/dettool_residimfile.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/dettool_residimfile.c (modified) (6 diffs)

branches/tap_branches/ippTools/src

@@ -16 +16 @@
 difftool
 disttool
+dqstatstool
 faketool
 flatcorr

@@ -16 +16 @@
 difftool
 disttool
+dqstatstool
 faketool
 flatcorr

branches/tap_branches/ippTools/src/dettool_residimfile.c

@@ -29 +29 @@
     psString query = pxDataGet("dettool_toresidimfile.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -165 +165 @@
     psString query = pxDataGet("dettool_residimfile.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -253 +253 @@
     psString query = pxDataGet("dettool_revertresidimfile.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -284 +284 @@
 
     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)) {
+
+    psMetadata *where = psMetadataAlloc();
+
+    PXOPT_COPY_S64(config->args,where,"-det_id","det_id","==");
+    PXOPT_COPY_S32(config->args,where,"-iteration", "iteration","==");
+    PXOPT_COPY_S64(config->args,where,"-exp_id","exp_id","==");
+    PXOPT_COPY_STR(config->args,where,"-class_id","class_id","==");
+
+    if (!setResidImfileDataState(config, where, data_state)) {
         return false;
     }
@@ -309 +314 @@
     psString query = pxDataGet("dettool_pendingcleanup_residimfile.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }
@@ -373 +378 @@
     psString query = pxDataGet("dettool_donecleanup_residimfile.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
     }

@@ -16 +16 @@
 difftool
 disttool
+dqstatstool
 faketool
 flatcorr