Changeset 19003 for branches/eam_branch_20080719/ippTools/src/stacktool.c

Timestamp:

Aug 10, 2008, 10:32:59 AM (18 years ago)

Author:

eugene

Message:

updates from current HEAD

File:

• branches/eam_branch_20080719/ippTools/src/stacktool.c (modified) (3 diffs)

branches/eam_branch_20080719/ippTools/src/stacktool.c

@@ -358 +358 @@
     if (!stackRunPrintObjects(stdout, list, !simple)) {
         psError(PS_ERR_UNKNOWN, false, "failed to print object");
-        return false;
-    }
-
+        psFree(list);
+        return false;
+    }
     psFree(list);
-
     return true;
 }
@@ -714 +713 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
-    PXOPT_COPY_S64(config->args, where, "-stack_id", "stack_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-warp_id", "warpRun.warp_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-stack_id", "stackSumSkyfile.stack_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -727 +728 @@
 
     if (psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, "stackSumSkyfile");
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);