Changeset 7315

Timestamp:

Jun 2, 2006, 3:15:12 PM (20 years ago)

Author:

jhoblitt

Message:

change -addnormalized to require options -det_id, -class_id, -uri, -stats, & -recipe

Location:

trunk/ippTools/src

Files:

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

trunk/ippTools/src/dettool.c

@@ -1075 +1075 @@
         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) {
@@ -1080 +1084 @@
         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) {
@@ -1085 +1093 @@
         return false;
     }
+    if (!uri) {
+        psError(PS_ERR_UNKNOWN, true, "-uri is required");
+        return false;
+    }
     psString recipe = psMetadataLookupStr(&status, config->args, "-recipe");
     if (!status) {
@@ -1090 +1102 @@
         return false;
     }
+    if (!recipe) {
+        psError(PS_ERR_UNKNOWN, true, "-recipe 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;
     }

trunk/ippTools/src/dettoolConfig.c

@@ -122 +122 @@
     psMetadata *addnormalizedArgs = psMetadataAlloc();
     psMetadataAddStr(addnormalizedArgs, PS_LIST_TAIL, "-det_id",  0,
-        "define detrend ID", NULL);
+        "define detrend ID (required)", NULL);
     psMetadataAddStr(addnormalizedArgs, PS_LIST_TAIL, "-iter",  0,
         "define iteration number", NULL);
     psMetadataAddStr(addnormalizedArgs, PS_LIST_TAIL, "-class_id",  0,
-        "define class ID", NULL);
+        "define class ID (required)", NULL);
     psMetadataAddStr(addnormalizedArgs, PS_LIST_TAIL, "-uri",  0,
-        "define URI", NULL);
+        "define URI (required)", NULL);
     psMetadataAddStr(addnormalizedArgs, PS_LIST_TAIL, "-stats",  0,
-        "define stat", NULL);
+        "define stat (required)", NULL);
     psMetadataAddStr(addnormalizedArgs, PS_LIST_TAIL, "-recipe",  0,
-        "define recipe", NULL);
+        "define recipe (required)", NULL);
 
     // -normalized