Changeset 7821

Timestamp:

Jul 5, 2006, 2:56:37 PM (20 years ago)

Author:

jhoblitt

Message:

fix arg handling (setup args with NULL instead of "")
misc arg handling improvements

File:

• trunk/ippTools/src/regtoolConfig.c (modified) (5 diffs)

trunk/ippTools/src/regtoolConfig.c

@@ -24 +24 @@
     psMetadata *pendingArgs = psMetadataAlloc();
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_id",  0,
-        "define exposure ID", "");
+        "define exposure ID", NULL);
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-inst",  0,
-        "define camera of interest", "");
+        "define camera of interest", NULL);
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-telescope",  0,
-        "define camera of interest", "");
+        "define camera of interest", NULL);
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_type",  0,
-        "define class", "");
+        "define class", NULL);
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-class",  0,
-        "define class", "");
+        "define class", NULL);
 
 
@@ -38 +38 @@
     psMetadata *updateArgs = psMetadataAlloc();
     psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-exp_id",  0,
-        "define class", "");
+        "define class", NULL); 
     psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-filter",  0,
-        "define filter of interest", "");
+        "define filter of interest", NULL);
     psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-stat",  0,
-        "define URL", "");
+        "define URL", NULL);
     psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-recipe",  0,
-        "define URL", "");
+        "define URL", NULL);
     psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-mosiac",  0,
-        "define URL", "");
+        "define URL", NULL);
 
 #define PXTOOL_MODE(option, modeval, argset) \
@@ -93 +93 @@
     // 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)) {\
@@ -98 +101 @@
             goto FAIL; \
         } \
-    }
+    } \
+}
 
     // generate SQL where claus
     config->where = psMetadataAlloc();
 
-{
-    psString str = NULL;
-    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");
-            goto FAIL;
+    {
+        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");
+                goto FAIL;
+            }
         }
     }
@@ -119 +123 @@
     addWhereStr(class_id);
     addWhereStr(filter);
-}
 
     if (config->where->list->n < 1) {