Changeset 16868 for trunk/ippTools/src/dettool.c

Timestamp:

Mar 7, 2008, 8:29:19 AM (18 years ago)

Author:

Paul Price

Message:

Some "required" parameters shouldn't be required if we're pushing in an error.

File:

• trunk/ippTools/src/dettool.c (modified) (15 diffs)

trunk/ippTools/src/dettool.c

@@ -1038 +1038 @@
         return false;
     }
-    
+
     if (config->where && active) {
         psString whereClause = psDBGenerateWhereSQL(config->where, "detRun");
@@ -1401 +1401 @@
     PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false);
     PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
-    PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false);
-    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", true, false);
+
+    // default values
+    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+
+    // Required if code == 0
+    PXOPT_LOOKUP_STR(uri, config->args, "-uri", (code == 0), false);
+    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", (code == 0), false);
 
     // optional
@@ -1418 +1423 @@
     PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false);
 
-    // default values
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
 
     // find the matching rawImfile by exp_id/class_id
@@ -1544 +1547 @@
     PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false);
-    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", true, false);
+
+    // default values
+    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+
+    // Required if code == 0
+    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", (code == 0), false);
 
     // optional
@@ -1560 +1568 @@
     PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", true, false);
 
-    // default values
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
 
     psString query = psStringCopy(
@@ -1951 +1957 @@
     PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
-    PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false);
-    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", true, false);
+
+    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+
+    // Required if code == 0
+    PXOPT_LOOKUP_STR(uri, config->args, "-uri", (code == 0), false);
+    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", (code == 0), false);
 
     // optional
@@ -1966 +1976 @@
     // default values
     PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false);
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
 
     // correlate the class_id against the input exposure(s)
@@ -2515 +2524 @@
     PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
-    PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false);
+
+    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+
+    // Required if code == 0
+    PXOPT_LOOKUP_STR(uri, config->args, "-uri", (code == 0), false);
 
     // optional
@@ -2530 +2543 @@
     // default values
     PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false);
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
 
     if (!detNormalizedImfileInsert(config->dbh,
@@ -2730 +2742 @@
     // required
     PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false);
-    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", true, false);
+
+    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+
+    // Required if code == 0
+    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", (code == 0), false);
 
     // optional
@@ -2745 +2761 @@
     // default values
     PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false);
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
 
     psString query = pxDataGet("dettool_tonormalizedexp.sql");
@@ -2973 +2988 @@
     PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
     PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false);
-    PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false);
-    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", true, false);
+
+    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+
+    // Required if code == 0
+    PXOPT_LOOKUP_STR(uri, config->args, "-uri", (code == 0), false);
+    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", (code == 0), false);
 
     // optional
@@ -3000 +3019 @@
     // default values
     PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false);
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
 
     if (!detResidImfileInsert(config->dbh,
@@ -3231 +3249 @@
     PXOPT_LOOKUP_STR(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false);
-    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", true, false);
+
+    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
+
+    // Required if code == 0
+    PXOPT_LOOKUP_STR(recipe, config->args, "-recip", (code == 0), false);
 
     // optional
@@ -3257 +3279 @@
     // default values
     PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", false, false);
-    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
     PXOPT_LOOKUP_BOOL(reject, config->args, "-reject", false);