Changeset 7304

Timestamp:

Jun 2, 2006, 11:58:39 AM (20 years ago)

Author:

jhoblitt

Message:

make -addstacked options -det_id, -class_id, -uri, -stats, & -recipe required

Location:

trunk/ippTools/src

Files:

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

trunk/ippTools/src/dettool.c

@@ -749 +749 @@
         return false;
     }
+    if (!det_id) {
+        psError(PS_ERR_UNKNOWN, true, "-det_id is required");
+        return false;
+    }
     psString class_id = psMetadataLookupStr(&status, config->args, "-class_id");
     if (!status) {
@@ -754 +758 @@
         return false;
     }
+    if (!class_id) {
+        psError(PS_ERR_UNKNOWN, true, "-class_id is required");
+        return false;
+    }
     psString uri    = psMetadataLookupStr(&status, config->args, "-uri");
     if (!status) {
@@ -759 +767 @@
         return false;
     }
+    if (!uri) {
+        psError(PS_ERR_UNKNOWN, true, "-uri is required");
+        return false;
+    }
+    psString stats = psMetadataLookupStr(&status, config->args, "-stats");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -stats");
+        return false;
+    }
+    if (!stats) {
+        psError(PS_ERR_UNKNOWN, true, "-stats is required");
+        return false;
+    }
     psString recipe = psMetadataLookupStr(&status, config->args, "-recipe");
     if (!status) {
@@ -764 +785 @@
         return false;
     }
-    psString stats = psMetadataLookupStr(&status, config->args, "-stats");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -stats");
+    if (!recipe) {
+        psError(PS_ERR_UNKNOWN, true, "-recipe is required");
         return false;
     }
@@ -879 +899 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    // XXX det_id is requried as a simplification
+    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;
+    }
+
     // find all detStackedImfile for det_id
-    // XXX det_id is requried as a simplification
     psArray *stackedImfiles =
         detStackedImfileSelectRowObjects(config->dbh, config->where, 0);
@@ -889 +920 @@
 
     // find all class_ids for the det_id's associated detInputExps
-    // find detInputExps in det_id
-    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");
-        psFree(stackedImfiles);
-        return false;
-    }
-
     psArray *valid_class_ids = validDetInputClassIds(config, det_id);
     if (!valid_class_ids) {

trunk/ippTools/src/dettoolConfig.c

@@ -81 +81 @@
     psMetadata *addstacArgs = psMetadataAlloc();
     psMetadataAddStr(addstacArgs, PS_LIST_TAIL, "-det_id",  0,
-        "define detrend ID", NULL);
+        "define detrend ID (required)", NULL);
     psMetadataAddStr(addstacArgs, PS_LIST_TAIL, "-iter",  0,
         "define iteration number", NULL);
     psMetadataAddStr(addstacArgs, PS_LIST_TAIL, "-class_id",  0,
-        "define class ID", NULL);
+        "define class ID (required)", NULL);
     psMetadataAddStr(addstacArgs, PS_LIST_TAIL, "-uri",  0,
-        "define URI", NULL);
+        "define URI (required)", NULL);
     psMetadataAddStr(addstacArgs, PS_LIST_TAIL, "-stats",  0,
-        "define stat", NULL);
+        "define stat (required)", NULL);
     psMetadataAddStr(addstacArgs, PS_LIST_TAIL, "-recipe",  0,
-        "define recipe", NULL);
+        "define recipe (required)", NULL);
     
     // -stacked
@@ -109 +109 @@
     psMetadata *stacframeArgs = psMetadataAlloc();
     psMetadataAddStr(stacframeArgs, PS_LIST_TAIL, "-det_id",  0,
-        "search for detrend ID", NULL);
+        "search for detrend ID (required)", NULL);
     psMetadataAddStr(stacframeArgs, PS_LIST_TAIL, "-iter",  0,
         "search for iteration number", NULL);