Changeset 31479

Timestamp:

May 6, 2011, 4:04:42 PM (15 years ago)

Author:

watersc1

Message:

merge to pick up fixes for LAP code

Location:

tags/ipp-20110505/ippTools/src

Files:

• laptool.c (modified) (1 diff)
• stacktool.c (modified) (1 diff)

tags/ipp-20110505/ippTools/src/laptool.c

@@ -560 +560 @@
   psMetadata *where = psMetadataAlloc();
   PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "==");
-  PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
+  PXOPT_COPY_S64(config->args, where, "-exp_id", "lapExp.exp_id", "==");
   
   psString query = pxDataGet("laptool_exposures.sql");

tags/ipp-20110505/ippTools/src/stacktool.c

@@ -508 +508 @@
           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);