Changeset 28003 for branches/pap/ippTools/src/staticskytool.c

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

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

branches/pap/ippTools/src/staticskytool.c

@@ -107 +107 @@
 
     // optional
-    PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
-    PXOPT_LOOKUP_STR(data_group, config->args, "-set_data_group", false, false);
-    PXOPT_LOOKUP_STR(dist_group, config->args, "-set_dist_group", false, false);
-    PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false);
-    PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false);
+    PXOPT_LOOKUP_STR(label,       config->args, "-set_label", false, false);
+    PXOPT_LOOKUP_STR(data_group,  config->args, "-set_data_group", false, false);
+    PXOPT_LOOKUP_STR(dist_group,  config->args, "-set_dist_group", false, false);
+    PXOPT_LOOKUP_STR(reduction,   config->args, "-set_reduction", false, false);
+    PXOPT_LOOKUP_STR(note,        config->args, "-set_note", false, false);
     PXOPT_LOOKUP_TIME(registered, config->args, "-set_registered", false, false);
 
@@ -118 +118 @@
 
     PXOPT_COPY_F32(config->args, where, "-select_good_frac_min", "stackSumSkyfile.good_frac", ">=");
-    PXOPT_COPY_STR(config->args, where, "-select_skycell_id", "stackRun.skycell_id", "==");
-    pxAddLabelSearchArgs(config, where, "-select_label", "stackRun.label", "LIKE");
-    pxAddLabelSearchArgs(config, where, "-select_filter", "stackRun.filter", "LIKE");
+    PXOPT_COPY_STR(config->args, where, "-select_skycell_id",    "stackRun.skycell_id",       "==");
+    pxAddLabelSearchArgs(config, where, "-select_label",         "stackRun.label",            "LIKE");
+    pxAddLabelSearchArgs(config, where, "-select_filter",        "stackRun.filter",           "LIKE");
 
     // these are used to build the HAVING restriction
-    PXOPT_COPY_S32(config->args, having, "-min_num", "num", ">=");
+    PXOPT_COPY_S32(config->args, having, "-min_num",    "num",        ">=");
     PXOPT_COPY_S32(config->args, having, "-min_filter", "num_filter", ">=");