Changeset 28484 for branches/pap/ippTools/src/dqstatstool.c

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/dqstatstool.c (modified) (2 diffs)

branches/pap/ippTools/src

@@ -39 +39 @@
 warptool
 staticskytool
-
 bgtool
+diffphottool

@@ -39 +39 @@
 warptool
 staticskytool
-
 bgtool
+diffphottool

branches/pap/ippTools/src/dqstatstool.c

@@ -85 +85 @@
 
   if (label) {
-    PXOPT_COPY_STR(config->args, where, "-label", "camRun.label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "camRun.label", "LIKE"); // define using cam label
   }
   // use psDBGenerateWhereConditionSQL because the SQL ends in a WHERE
@@ -654 +654 @@
         psError(PS_EXIT_CONFIG_ERROR, false, "Unable to find max value for %s",colname);
         return(false);
-      }      
+      }
+      psString filter = psMetadataLookupStr(&status,rule,"FILTER");
+      if (!status) {
+        status = true;
+      }
+      if (filter) {
+        psString imfilter = psMetadataLookupStr(&status,tableRow,"FILTER");
+        if (strcmp(filter,imfilter) != 0) {
+          continue;
+        }
+      }
       // Not happy with this being set to a F32. Can this ever be something else?
       psF32 value      = psMetadataLookupF32(&status,tableRow,colname);

@@ -39 +39 @@
 warptool
 staticskytool
-
 bgtool
+diffphottool