Changeset 31587 for branches/eam_branches/ipp-20110505/ippTools/src/laptool.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/laptool.c (modified) (2 diffs)

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

@@ -384 +384 @@
   PXOPT_COPY_STR(config->args, where, "-projection_cell", "projection_cell", "==");
   PXOPT_COPY_STR(config->args, where, "-filter", "filter", "==");
-  PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+  //  PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
   PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
   PXOPT_COPY_STR(config->args, where, "-fault", "fault", "==");
 
+  pxAddLabelSearchArgs(config, where, "-label", "lapRun.label", "==");
+  
   psString query = pxDataGet("laptool_pendingrun.sql");
   if (!query) {
@@ -560 +562 @@
   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");