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

branches/eam_branch_20080706/ippTools/src/pztoolConfig.c

@@ -222 +222 @@
     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; \
-        } \
-    } \
-}
-
     // generate SQL where clause
     config->where = psMetadataAlloc();
 
-    addWhereStr(exp_name); 
-    addWhereStr(telescope); 
-    // convert '-inst' to 'camera'
-    {
-        psString str = NULL;
-        bool status = false;
-        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");
-                psFree(config);
-                return NULL;
-            }
-        }
-    }
-    addWhereStr(exp_type); 
-    addWhereStr(class); 
-    addWhereStr(class_id); 
+    PXOPT_ADD_WHERE_STR(exp_name); 
+    PXOPT_ADD_WHERE_STR(telescope); 
+    PXOPT_ADD_WHERE_STR_ALIAS("-inst", "camera");
+    PXOPT_ADD_WHERE_STR(exp_type); 
+    PXOPT_ADD_WHERE_STR(class); 
+    PXOPT_ADD_WHERE_STR(class_id); 
 
     if (config->where->list->n < 1) {