Changeset 16621

Timestamp:

Feb 22, 2008, 4:20:15 PM (18 years ago)

Author:

jhoblitt

Message:

update

Location:

trunk/ippTools/src

Files:

• flatcorr.c (modified) (3 diffs)
• flatcorrConfig.c (modified) (1 diff)

trunk/ippTools/src/flatcorr.c

@@ -106 +106 @@
     PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "dateobs", "<=");
     PXOPT_COPY_STR(config->args, where, "-exp_tag", "exp_tag", "==");
-    PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "==");
     PXOPT_COPY_STR(config->args, where, "-filelevel", "filelvel", "==");
     PXOPT_COPY_STR(config->args, where, "-reduction", "reduction", "==");
@@ -140 +139 @@
     if (where->list->n < 1) {
         psFree(where);
-        where = NULL;
+        psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
+        return false;
     }
 
@@ -151 +151 @@
     PXOPT_LOOKUP_STR(tess_id, config->args, "-set_tess_id", false, false);
     PXOPT_LOOKUP_STR(end_stage, config->args, "-set_end_stage", false, false);
+
+    // default
+    PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "==");
 
     PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);

trunk/ippTools/src/flatcorrConfig.c

@@ -63 +63 @@
             "search by exp_tag", NULL);
     psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-exp_type",  0,
-            "search by exp_type", NULL);
+            "search by exp_type", "object");
     psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-filelevel",  0,
             "search by filelevel", NULL);