Changeset 8504

Timestamp:

Aug 22, 2006, 6:42:41 PM (20 years ago)

Author:

jhoblitt

Message:

rename -updatedetrun -rerun -> -again to avoid conflicting with the -rerun mode

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (1 diff)
• dettoolConfig.c (modified) (1 diff)

trunk/ippTools/src/dettool.c

@@ -3689 +3689 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    // either -rerun or -stop must be specified
+    bool status = false;
+    bool again = psMetadataLookupBool(&status, config->args, "-again");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -again");
+        return false;
+    }
+    bool stop = psMetadataLookupBool(&status, config->args, "-stop");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -stop");
+        return false;
+    }
+    if (!(again || stop)) {
+        psError(PS_ERR_UNKNOWN, true, "either -again or -stop must be specified");
+        return false;
+    }
+    if (again && stop) {
+        psError(PS_ERR_UNKNOWN, true, "either -again or -stop must be specified");
+        return false;
+    }
+
     return true;
 }

trunk/ippTools/src/dettoolConfig.c

@@ -401 +401 @@
     psMetadataAddStr(updatedetrunArgs, PS_LIST_TAIL, "-det_id",  0,
         "search for detrend master for detrend ID (required)", NULL);
-    psMetadataAddBool(updatedetrunArgs, PS_LIST_TAIL, "-rerun",  0,
+    psMetadataAddBool(updatedetrunArgs, PS_LIST_TAIL, "-again",  0,
         "start a new iteration of this detrend run", false);
     psMetadataAddBool(updatedetrunArgs, PS_LIST_TAIL, "-stop",  0,