Changeset 7316

Timestamp:

Jun 2, 2006, 3:19:00 PM (20 years ago)

Author:

jhoblitt

Message:

change -normalized[frame] to require option -det_id

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (3 diffs)
• dettoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/dettool.c

@@ -1174 +1174 @@
    
     // det_id is required
+    // psString det_id is unused... it is only checked for to make sure it is
+    // in config->where
+    bool status = false;
+    psString det_id = psMetadataLookupStr(&status, config->args, "-det_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -det_id");
+        return false;
+    }
+    if (!det_id) {
+        psError(PS_ERR_UNKNOWN, true, "-det_id is required");
+        return false;
+    }
 
     psArray *masterImfiles =
@@ -1205 +1217 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
     
-    // det_id is required
+    // XXX det_id is requried as a simplification
     bool status = false;
     psString det_id = psMetadataLookupStr(&status, config->args, "-det_id");
@@ -1212 +1224 @@
         return false;
     }
+    if (!det_id) {
+        psError(PS_ERR_UNKNOWN, true, "-det_id is required");
+        return false;
+    }
 
     // find all detNormalizedIImfile for det_id
-    // XXX det_id is requried as a simplification
     psArray *masterImfiles =
         detNormalizedImfileSelectRowObjects(config->dbh, config->where, 0);

trunk/ippTools/src/dettoolConfig.c

@@ -137 +137 @@
     psMetadata *normalizedArgs = psMetadataAlloc();
     psMetadataAddStr(normalizedArgs, PS_LIST_TAIL, "-det_id",  0,
-        "search for detrend ID", NULL);
+        "search for detrend ID (required)", NULL);
     psMetadataAddStr(normalizedArgs, PS_LIST_TAIL, "-iter",  0,
         "search for iteration number", NULL);
@@ -150 +150 @@
     psMetadata *normalizedframeArgs = psMetadataAlloc();
     psMetadataAddStr(normalizedframeArgs, PS_LIST_TAIL, "-det_id",  0,
-        "search for detrend ID", NULL);
+        "search for detrend ID (required)", NULL);
     psMetadataAddStr(normalizedframeArgs, PS_LIST_TAIL, "-iter",  0,
         "search for iteration number", NULL);