Changeset 7302

Timestamp:

Jun 2, 2006, 11:44:16 AM (20 years ago)

Author:

jhoblitt

Message:

make -addprocessed options -det_id, -exp_id, -class_id, -uri, -stats, & -recipe required

Location:

trunk/ippTools/src

Files:

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

trunk/ippTools/src/dettool.c

@@ -431 +431 @@
         return false;
     }
+    if (!det_id) {
+        psError(PS_ERR_UNKNOWN, true, "-det_id is required");
+        return false;
+    }
     psString exp_id = psMetadataLookupStr(&status, config->args, "-exp_id");
     if (!status) {
@@ -436 +440 @@
         return false;
     }
+    if (!exp_id) {
+        psError(PS_ERR_UNKNOWN, true, "-exp_id is required");
+        return false;
+    }
     psString class_id = psMetadataLookupStr(&status, config->args, "-class_id");
     if (!status) {
@@ -441 +449 @@
         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) {
@@ -446 +458 @@
         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) {
         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -recipe");
+        return false;
+    }
+    if (!recipe) {
+        psError(PS_ERR_UNKNOWN, true, "-recipe is required");
         return false;
     }
@@ -473 +502 @@
 
     // create a new detProcessedImfile object
-    psString stats = ((rawImfileRow *)rawImfiles->data[0])->stats;
     detProcessedImfileRow *detRow = detProcessedImfileRowAlloc(
         (psS32)atol(det_id), exp_id, class_id, uri, stats, recipe

trunk/ippTools/src/dettoolConfig.c

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