Changeset 27838 for branches/tap_branches/ippTools/src/dettool_processedimfile.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_processedimfile.c (modified) (7 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_processedimfile.c

@@ -34 +34 @@
     psString query = pxDataGet("dettool_toprocessedimfile.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;
     }
@@ -180 +180 @@
     psString query = pxDataGet("dettool_processedimfile.sql");
     if (!query) {
-        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         psFree(where);
         return false;
@@ -267 +267 @@
     psString query = pxDataGet("dettool_revertprocessedimfile.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;
     }
@@ -298 +298 @@
 
     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(class_id, config->args, "-class_id", true, false);
     PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
 
-    if (!setProcessedImfileDataState(config, det_id, exp_id, class_id, data_state)) {
-        return false;
-    }
+    psMetadata *where = psMetadataAlloc();
+
+    PXOPT_COPY_S64(config->args,where,"-det_id", "det_id","==");
+    PXOPT_COPY_S64(config->args,where,"-exp_id", "exp_id","==");
+    PXOPT_COPY_STR(config->args,where,"-class_id","class_id","==");
+
+    if (!setProcessedImfileDataState(config, where, data_state)) {
+        return false;
+    }
+    psFree(where);
     return true;
 }
@@ -322 +327 @@
     psString query = pxDataGet("dettool_pendingcleanup_processedimfile.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;
     }
@@ -351 +356 @@
     if (!output) {
         psError(PS_ERR_UNKNOWN, false, "database error");
-/*      fprintf(stderr,"WTF !output?\n"); */
+/*      fprintf(stderr,"WTF !output?\n"); */
         return false;
     }
     if (!psArrayLength(output)) {
         psTrace("dettool", PS_LOG_INFO, "no rows found");
-/*      fprintf(stderr,"WTF no rows??\n"); */
+/*      fprintf(stderr,"WTF no rows??\n"); */
         psFree(output);
         return true;
@@ -392 +397 @@
     psString query = pxDataGet("dettool_donecleanup_processedimfile.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