Changeset 18468 for branches/eam_branch_20080706/ippTools/src/guidetoolConfig.c

Timestamp:

Jul 11, 2008, 8:30:31 AM (18 years ago)

Author:

eugene

Message:

make argument handling consistent across all tools

File:

• branches/eam_branch_20080706/ippTools/src/guidetoolConfig.c (modified) (1 diff)

branches/eam_branch_20080706/ippTools/src/guidetoolConfig.c

@@ -146 +146 @@
     psFree(defineArgs);
 
-    // setup search criterion
-#define addWhereStr(name) \
-    if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
-        if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\
-            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-            exit(EXIT_FAILURE); \
-        } \
-    }
-
     // generate SQL where clause
     config->where = psMetadataAlloc();
 
-{
-    psString str = NULL;
-    int n = 0;
-    bool status = false;
-
-    addWhereStr(exp_id);
-    // convert '-inst' to 'camera'
-    if ((str = psMetadataLookupStr(&status, config->args, "-inst"))) {
-        if (!psMetadataAddStr(config->where, PS_LIST_TAIL, "camera", 0, "==", str)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item camera");
-            exit(EXIT_FAILURE);
-        }
-    }
-    addWhereStr(telescope);
-    addWhereStr(exp_type);
-    if ((n = psMetadataLookupS32(&status, config->args, "-imfiles"))) {
-        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "imfiles", 0, "==", n)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles");
-            exit(EXIT_FAILURE);
-        }
-    }
-    addWhereStr(filter);
-    addWhereStr(stats);
-    addWhereStr(recipe);
-    if ((n = psMetadataLookupS32(&status, config->args, "-guide_version"))) {
-        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "guide_version", 0, "==", n)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item guide_version");
-            exit(EXIT_FAILURE);
-        }
-    }
-}
+    PXOPT_ADD_WHERE_STR_ALIAS("-inst","camera");
+    PXOPT_ADD_WHERE_STR(telescope);
+    PXOPT_ADD_WHERE_STR(exp_type);
+    PXOPT_ADD_WHERE_S32(imfiles);
+    PXOPT_ADD_WHERE_STR(filter);
+    PXOPT_ADD_WHERE_STR(stats);
+    PXOPT_ADD_WHERE_STR(recipe);
+    PXOPT_ADD_WHERE_S32(guide_version);
 
     if (config->where->list->n < 1) {