Changeset 7063 for trunk/ippTools/src/dettoolConfig.c

Timestamp:

May 3, 2006, 6:08:05 PM (20 years ago)

Author:

jhoblitt

Message:

config style update

File:

• trunk/ippTools/src/dettoolConfig.c (modified) (10 diffs)

trunk/ippTools/src/dettoolConfig.c

@@ -42 +42 @@
     psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-exp_id",  0,
         "include this exposure (XXX more then one)", NULL);
-    psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-dettype",  0,
+    psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-det_type",  0,
         "define the type of detrend run", NULL);
 
@@ -100 +100 @@
         "search for iteration number", NULL);
 
-#define PXTOOL_MODE(option, modeval, args) \
+#define PXTOOL_MODE(option, modeval, argset) \
     if ((N = psArgumentGet (argc, argv, option))) { \
         psArgumentRemove (N, &argc, argv); \
@@ -107 +107 @@
         } \
         config->mode = modeval; \
-        argSet = psMemIncrRefCounter(args); \
+        config->args = psMemIncrRefCounter(argset); \
     }
 
     // find which mode we're running under
     int N = 0;
-    psMetadata *argSet = NULL;
     config->mode = DETTOOL_MODE_NONE;
     if ((N = psArgumentGet (argc, argv, "-define"))) {
@@ -120 +119 @@
         }
         config->mode = DETTOOL_MODE_DEFINE;
-        argSet = psMemIncrRefCounter(defineArgs);
+        config->args = psMemIncrRefCounter(defineArgs);
     }
     PXTOOL_MODE("-raw",             DETTOOL_MODE_RAW,           rawArgs);
@@ -132 +131 @@
         argErr = true;
         fprintf (stderr, "mode argument is required\n");
-    } else if (! psArgumentParse(argSet, &argc, argv) || argc != 1) {
+    } else if (! psArgumentParse(config->args, &argc, argv) || argc != 1) {
         argErr = true;
         fprintf (stderr, "error parsing arguments\n");
@@ -174 +173 @@
     // setup search criterion
 #define addWhereStr(name) \
-    if ((str = psMetadataLookupStr(&status, argSet, "-" #name))) { \
-        if (!psMetadataAddStr(where, PS_LIST_TAIL, #name, 0, "==", str)) {\
+    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(where); \
             exit(EXIT_FAILURE); \
         } \
@@ -183 +181 @@
 
     // generate SQL where claus
-    psMetadata *where = psMetadataAlloc();
+    config->where = psMetadataAlloc();
 
 {
@@ -192 +190 @@
     addWhereStr(exp_id);
     // convert '-inst' to 'camera'
-    if ((str = psMetadataLookupStr(&status, argSet, "-inst"))) {
-        if (!psMetadataAddStr(where, PS_LIST_TAIL, "camera", 0, "==", str)) {
+    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(where);
             exit(EXIT_FAILURE);
         }
@@ -201 +198 @@
     addWhereStr(telescope);
     addWhereStr(exp_type);
-    if ((n = psMetadataLookupS32(&status, argSet, "-imfiles"))) {
-        if (!psMetadataAddS32(where, PS_LIST_TAIL, "imfiles", 0, "==", n)) {
+    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");
-            psFree(where);
             exit(EXIT_FAILURE);
         }
@@ -211 +207 @@
     addWhereStr(stats);
     addWhereStr(recipe);
-    if ((n = psMetadataLookupS32(&status, argSet, "-p1_version"))) {
-        if (!psMetadataAddS32(where, PS_LIST_TAIL, "p1_version", 0, "==", n)) {
+    if ((n = psMetadataLookupS32(&status, config->args, "-p1_version"))) {
+        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "p1_version", 0, "==", n)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item p1_version");
-            psFree(where);
             exit(EXIT_FAILURE);
         }
     }
 }
-    psFree(argSet);
-
-    if (where->list->n < 1) {
-        psFree(where);
-        where = NULL;
-    }
-
-    config->where = where;
+
+    if (config->where->list->n < 1) {
+        psFree(config->where);
+        config->where = NULL;
+    }
 
     // define Database handle, if used