Changeset 31606 for branches/czw_branch/20110406/ippTools/src/stacktool.c

Timestamp:

Jun 6, 2011, 1:56:22 PM (15 years ago)

Author:

watersc1

Message:

merge from trunk before working on new stacking code

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/stacktool.c (modified) (3 diffs)

branches/czw_branch/20110406/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", ">=");
@@ -487 +488 @@
         // Define the requested association, and insert it if it doesn't already exist
         stackAssociationRow *association = pxStackAssociationDefine(config,stack_id);
-        psS64 sass_id;
+        psS64 sass_id=-1;
         if (!association->sass_id) {
           psTrace("stacktool.association",2,"No required Association found. Adding.");
@@ -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);