Changeset 18468 for branches/eam_branch_20080706/ippTools/src/magictoolConfig.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/magictoolConfig.c (modified) (1 diff)

branches/eam_branch_20080706/ippTools/src/magictoolConfig.c

@@ -184 +184 @@
     psFree(modes);
 
-    // setup search criterion
-#define addWhereStr(name) \
-{ \
-    psString str = NULL; \
-    bool status = false; \
-    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); \
-            psFree(config); \
-            return NULL; \
-        } \
-    } \
-}
-
-#define addWhereS32(name) \
-{ \
-    psS32 s32 = 0; \
-    bool status = false; \
-    if ((s32= psMetadataLookupS32(&status, config->args, "-" #name))) { \
-        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, #name, 0, "==", s32)) { \
-            psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
-            psFree(config); \
-            return NULL; \
-        } \
-    } \
-}
-
-
     // generate SQL where clause
     config->where = psMetadataAlloc();
 
-{
-    psString str = NULL;
-    bool status = false;
-    if ((str = psMetadataLookupStr(&status, config->args, "-warp_id"))) {
-        if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "warp_id", 0, "==", (psS64)atoll(str))) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
-            psFree(config);
-            return NULL;
-        }
-    }
-}
-    addWhereStr(skycell_id);
-    addWhereStr(tess_id);
-    addWhereStr(exp_id);
-
-    // convert '-code' to 'fault'
-    {
-        psS16 fault = 0;
-        bool status = false;
-        if ((fault = psMetadataLookupS16(&status, config->args, "-code"))) {
-            if (!psMetadataAddS16(config->where, PS_LIST_TAIL, "fault", 0, "==", fault)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
-                psFree(config);
-                return NULL;
-            }
-        }
-    }
+    PXOPT_ADD_WHERE_S64(warp_id);
+    PXOPT_ADD_WHERE_STR(skycell_id);
+    PXOPT_ADD_WHERE_STR(tess_id);
+    PXOPT_ADD_WHERE_STR(exp_id);
+    PXOPT_ADD_WHERE_STR_ALIAS("-code", "fault");
 
     if (config->where->list->n < 1) {