Changeset 31587 for branches/eam_branches/ipp-20110505/ippTools/src/stacktool.c

Timestamp:

May 29, 2011, 11:26:31 AM (15 years ago)

Author:

eugene

Message:

merging changes from trunk

File:

• branches/eam_branches/ipp-20110505/ippTools/src/stacktool.c (modified) (2 diffs)

branches/eam_branches/ipp-20110505/ippTools/src/stacktool.c

@@ -246 +246 @@
     PXOPT_COPY_STR(config->args,  where, "-select_data_group",         "warpRun.data_group", "==");
     pxAddLabelSearchArgs (config, where, "-select_label",              "warpRun.label", "LIKE"); // define using warp label
-
+    pxAddLabelSearchArgs (config, where, "-warp_id",                   "warpRun.warp_id", "==");
+    
     // these are used to build the HAVING restriction
     PXOPT_COPY_S32(config->args, having, "-min_num", "num_warp", ">=");
@@ -508 +509 @@
           association->sass_id = sass_id;
         }
+        else {
+          sass_id = association->sass_id;
+        }
         // Insert the map entry for this row.
         stackAssociationMapRow *maprow = stackAssociationMapRowAlloc(sass_id,stack_id);