Changeset 10150

Timestamp:

Nov 22, 2006, 3:41:55 PM (20 years ago)

Author:

jhoblitt

Message:

add -det_mode support to the appropriate tool modes

Location:

trunk/ippTools/src

Files:

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

trunk/ippTools/src/dettool.c

@@ -80 +80 @@
 static psS32 incrementIteration(pxConfig *config, const char *det_id);
 static bool setDetRunState(pxConfig *config, const char *det_id, const char *state);
+static bool isValidMode(pxConfig *config, const char *mode);
 
 # define MODECASE(caseName, func) \
@@ -232 +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");
+        return false;
+    }
+
     psString exp_type = psMetadataLookupStr(&status, config->args, "-exp_type");
     if (!status) {
@@ -392 +404 @@
             0,
             det_type,
+            det_mode,
             "run",
             exp_type,
@@ -601 +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");
+        return false;
+    }
+
     psString exp_type = psMetadataLookupStr(&status, config->args, "-set_exp_type");
     if (!status) {
@@ -709 +733 @@
             0,
             det_type,
+            det_mode,
             "run",
             exp_type,
@@ -856 +881 @@
 
     // walk through the optional values and update the detRun as required
+    psString det_type = psMetadataLookupStr(&status, config->args, "-set_det_type");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_det_type");
+        return false;
+    }
+    if (det_type) {
+        psFree(detRun->det_type);
+        detRun->det_type = psStringCopy(det_type);
+    }
+
+    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 exp_type = psMetadataLookupStr(&status, config->args, "-set_exp_type");
     if (!status) {
@@ -4973 +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");
+        return false;
+    }
+
     psString exp_type = psMetadataLookupStr(&status, config->args, "-exp_type");
     if (!status) {
@@ -5087 +5148 @@
             0,  // the iteration is fixed at 0
             det_type,
+            det_mode,
             "reg",
             exp_type,
@@ -5289 +5351 @@
     return true;
 }
+
+static bool isValidMode(pxConfig *config, const char *mode)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    PS_ASSERT_PTR_NON_NULL(mode, false);
+
+    // check that state is a valid string value
+    if (!(
+            (strncmp(mode, "create", 7) == 0) 
+            || (strncmp(mode, "verify", 7) == 0) 
+        )
+    ) {
+        psError(PS_ERR_UNKNOWN, false,
+                "invalid detRun mode: %s", mode);
+        return false;
+    }
+
+    return true;
+}

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,
+            "define the mode of this detrend run", "create");
     psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-exp_type",  0,
         "define exposure type", NULL);
@@ -97 +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,
+            "define the mode of this detrend run", "create");
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_type",  0,
             "search for exp_type", NULL);
@@ -134 +138 @@
     psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-det_id",  0,
             "det ID to base a new detRun on (required)", NULL);
+    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,
+            "define the mode of this detrend run", "create");
     psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_exp_type",  0,
         "define exposure type", NULL);
@@ -556 +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,
+            "define the mode of this detrend run", "create");
     psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-exp_type",  0,
         "define exposure type", NULL);