Changeset 31294

Timestamp:

Apr 15, 2011, 10:26:18 AM (15 years ago)

Author:

bills

Message:

merge in changes to staticskytool to support a single input

Location:

tags/ipp-20110406/ippTools/src

Files:

• staticskytool.c (modified) (3 diffs, 1 prop)
• staticskytoolConfig.c (modified) (1 diff, 1 prop)

tags/ipp-20110406/ippTools/src/staticskytool.c

@@ -115 +115 @@
     PXOPT_COPY_F32(config->args, whereMD, "-select_good_frac_min", "stackSumSkyfile.good_frac", ">=");
     pxAddLabelSearchArgs(config, whereMD, "-select_label",         "stackRun.label",            "LIKE");
+    pxAddLabelSearchArgs(config, whereMD, "-select_data_group",    "stackRun.data_group",       "LIKE");
     pxAddLabelSearchArgs(config, whereMD, "-select_filter",        "stackRun.filter",           "LIKE");
 
@@ -123 +124 @@
     psAssert (filters->data.list->n, "-select_filter should at least have a place-holder");
     int num_filter = filters->data.list->n;
-    if (num_filter < 2) {
-        psError(PXTOOLS_ERR_CONFIG, false, "invalid request: only 1 filter selected");
-        psFree(whereMD);
-        return false;
-    }
 
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -284 +280 @@
         }
 
-        // create a chipRun
+        // create a staticskyRun
         if (!staticskyRunInsert(config->dbh,
                                 0x0,         // sky_id

tags/ipp-20110406/ippTools/src/staticskytoolConfig.c

@@ -52 +52 @@
     psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_good_frac_min", 0, "define min good_frac", 0.0);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_label", PS_META_DUPLICATE_OK, "search by stackRun label (LIKE comparison, multiple OK)", NULL);
-    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_filter", PS_META_DUPLICATE_OK, "search by filter (LIKE comparison, multiple required)", NULL);
+    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_data_group", PS_META_DUPLICATE_OK, "search by stackRun data_group (LIKE comparison, multiple OK)", NULL);
+    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_filter", PS_META_DUPLICATE_OK, "search by filter (LIKE comparison, multiplei OK)", NULL);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_workdir", 0, "define workdir (required)", NULL);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_label", 0, "define label", NULL);