Changeset 12429

Timestamp:

Mar 12, 2007, 6:50:03 PM (19 years ago)

Author:

jhoblitt

Message:

set a default value for filelevel in -defineby[...]

File:

• trunk/ippTools/src/dettool.c (modified) (4 diffs)

trunk/ippTools/src/dettool.c

@@ -242 +242 @@
     }
 
+    // optional
     psString filelevel = psMetadataLookupStr(&status, config->args, "-filelevel");
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filelevel");
-        return false;
-    }
-    if (!filelevel) {
-        psError(PS_ERR_UNKNOWN, true, "-filelevel is required");
         return false;
     }
@@ -501 +498 @@
         psAbort(    "an -exp_tag matched more then one rawExp (this should not happen");
 
+    }
+
+    // check to see if -filelevel was set on the command line
+    if (!filelevel) {
+        filelevel = psStringCopy(((rawExpRow *)detrendExps->data[0])->filelevel);
     }
 
@@ -672 +674 @@
     }
 
+    // optional
     psString filelevel = psMetadataLookupStr(&status, config->args, "-filelevel");
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filelevel");
-        return false;
-    }
-    if (!filelevel) {
-        psError(PS_ERR_UNKNOWN, true, "-filelevel is required");
         return false;
     }
@@ -1146 +1145 @@
         psFree(use_end);
         return true;
+    }
+
+    // check to see if -filelevel was set on the command line
+    if (!filelevel) {
+        filelevel = psStringCopy(((rawExpRow *)detrendExps->data[0])->filelevel);
     }