Changeset 10158

Timestamp:

Nov 22, 2006, 3:50:18 PM (20 years ago)

Author:

jhoblitt

Message:

rename detRun.det_mode -> .mode

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (7 diffs)
• dettoolConfig.c (modified) (4 diffs)

trunk/ippTools/src/dettool.c

@@ -233 +233 @@
 
     // optional
-    psString det_mode = psMetadataLookupStr(&status, config->args, "-det_mode");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -det_mode");
-        return false;
-    }
-    // check det_mode
-    if (det_mode && !isValidMode(config, det_mode)) {
-        psError(PS_ERR_UNKNOWN, false, "invalud det_mode");
+    psString mode = psMetadataLookupStr(&status, config->args, "-mode");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -mode");
+        return false;
+    }
+    // check mode
+    if (mode && !isValidMode(config, mode)) {
+        psError(PS_ERR_UNKNOWN, false, "invalud mode");
         return false;
     }
@@ -404 +404 @@
             0,
             det_type,
-            det_mode,
+            mode,
             "run",
             exp_type,
@@ -614 +614 @@
 
     // optional
-    psString det_mode = psMetadataLookupStr(&status, config->args, "-det_mode");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -det_mode");
-        return false;
-    }
-    // check det_mode
-    if (det_mode && !isValidMode(config, det_mode)) {
-        psError(PS_ERR_UNKNOWN, false, "invalud det_mode");
+    psString mode = psMetadataLookupStr(&status, config->args, "-mode");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -mode");
+        return false;
+    }
+    // check mode
+    if (mode && !isValidMode(config, mode)) {
+        psError(PS_ERR_UNKNOWN, false, "invalud mode");
         return false;
     }
@@ -733 +733 @@
             0,
             det_type,
-            det_mode,
+            mode,
             "run",
             exp_type,
@@ -891 +891 @@
     }
 
-    psString det_mode = psMetadataLookupStr(&status, config->args, "-set_det_mode");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_det_mode");
-        return false;
-    }
-    // check det_mode
-    if (det_mode && !isValidMode(config, det_mode)) {
-        psError(PS_ERR_UNKNOWN, false, "invalud det_mode");
-        return false;
-    }
-    if (det_mode) {
-        psFree(detRun->det_mode);
-        detRun->det_mode = psStringCopy(det_mode);
+    psString mode = psMetadataLookupStr(&status, config->args, "-set_mode");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_mode");
+        return false;
+    }
+    // check mode
+    if (mode && !isValidMode(config, mode)) {
+        psError(PS_ERR_UNKNOWN, false, "invalud mode");
+        return false;
+    }
+    if (mode) {
+        psFree(detRun->mode);
+        detRun->mode = psStringCopy(mode);
     }
 
@@ -5023 +5023 @@
 
     // everything else is optional
-    psString det_mode = psMetadataLookupStr(&status, config->args, "-det_mode");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -det_mode");
-        return false;
-    }
-    // check det_mode
-    if (det_mode && !isValidMode(config, det_mode)) {
-        psError(PS_ERR_UNKNOWN, false, "invalud det_mode");
+    psString mode = psMetadataLookupStr(&status, config->args, "-mode");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -mode");
+        return false;
+    }
+    // check mode
+    if (mode && !isValidMode(config, mode)) {
+        psError(PS_ERR_UNKNOWN, false, "invalud mode");
         return false;
     }
@@ -5148 +5148 @@
             0,  // the iteration is fixed at 0
             det_type,
-            det_mode,
+            mode,
             "reg",
             exp_type,

trunk/ippTools/src/dettoolConfig.c

@@ -68 +68 @@
     psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-det_type",  0,
             "define the type of detrend run (required)", NULL);
-    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-det_mode",  0,
+    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-mode",  0,
             "define the mode of this detrend run", "create");
     psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-exp_type",  0,
@@ -99 +99 @@
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-det_type",  0,
             "define the type of detrend run (required)", NULL);
-    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-det_mode",  0,
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-mode",  0,
             "define the mode of this detrend run", "create");
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_type",  0,
@@ -140 +140 @@
     psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_det_type",  0,
             "define the type of detrend run (required)", NULL);
-    psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_det_mode",  0,
+    psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_mode",  0,
             "define the mode of this detrend run", "create");
     psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_exp_type",  0,
@@ -564 +564 @@
     psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-det_type",  0,
             "define the type of detrend run (required)", NULL);
-    psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-det_mode",  0,
+    psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-mode",  0,
             "define the mode of this detrend run", "create");
     psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-exp_type",  0,