Changeset 7034

Timestamp:

May 1, 2006, 4:11:11 PM (20 years ago)

Author:

jhoblitt

Message:

completely fix CLI search options

File:

• trunk/ippTools/src/guidetoolConfig.c (modified) (6 diffs)

trunk/ippTools/src/guidetoolConfig.c

@@ -17 +17 @@
     config->modules = pmConfigRead(&argc, argv);
     if (!config->modules) {
-        psError(PS_ERR_UNKNOWN, false, "Can't find site configuration!\n");
+        psError(PS_ERR_UNKNOWN, false, "Can't find site configuration");
         exit(EXIT_FAILURE);
     }
@@ -25 +25 @@
     psMetadata *args = psMetadataAlloc();
     psMetadataAddStr(args , PS_LIST_TAIL, "-pending", 0,
-        "examine pending image table, write ppImage output", "");
+        "examine pending image table, write ppImage output", NULL);
     psMetadataAddStr(args , PS_LIST_TAIL, "-define",  0,
-        "update pending image table", "");
+        "update pending image table", NULL);
 
     // -pending search
     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 telescope of interest", "");
+        "define telescope of interest", NULL);
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_type",  0,
-        "define exposure type", "");
+        "define exposure type", NULL);
     psMetadataAddS32(pendingArgs, PS_LIST_TAIL, "-imfiles",  0,
         "define number of imfiles", 0);
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-filter",  0,
-        "define filter of interest", "");
+        "define filter of interest", NULL);
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-stats",  0,
-        "define stats of interest", "");
+        "define stats of interest", NULL);
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-recipe",  0,
-        "define recipe of interest", "");
+        "define recipe of interest", NULL);
     psMetadataAddS32(pendingArgs, PS_LIST_TAIL, "-p1_version",  0,
         "define p1_version of interest", 0);
@@ -53 +53 @@
     psMetadata *defineArgs = psMetadataAlloc();
     psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-exp_id",  0,
-        "define class", "");
+        "define class", NULL);
     psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-inst",  0,
-        "define camera of interest", "");
+        "define camera of interest", NULL);
     psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-telescope",  0,
-        "define camera of interest", "");
+        "define camera of interest", NULL);
     psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-exp_type",  0,
-        "define class", "");
+        "define class", NULL);
     psMetadataAddS32(defineArgs, PS_LIST_TAIL, "-imfiles",  0,
         "define number of imfiles", 0);
     psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-filter",  0,
-        "define filter of interest", "");
+        "define filter of interest", NULL);
     psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-stats",  0,
-        "define stats of interest", "");
+        "define stats of interest", NULL);
     // these two are inputs NOT search parameters
     psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-recipe",  0,
-        "define recipe of interest", "");
+        "define recipe of interest", NULL);
     psMetadataAddS32(defineArgs, PS_LIST_TAIL, "-p1_version",  0,
         "define p1_version of interest", 0);
@@ -100 +100 @@
             break;
         default:
-            argSet = psMemIncrRefCounter(args);
+            argSet = args;
     }
+    psMemIncrRefCounter(argSet);
 
     bool argErr = false;
@@ -147 +148 @@
     bool status = false;
 
-    if ((str = psMetadataLookupStr(&status, argSet, "-exp_id"))) {
-        if (!psMetadataAddStr(where, PS_LIST_TAIL, "-exp_id", 0, "==", str)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item -exp_id");
-            psFree(where);
-            exit(EXIT_FAILURE);
-        }
-    }
     addWhereStr(exp_id);
     // convert '-inst' to 'camera'
@@ -193 +187 @@
     // define Database handle, if used
     config->dbh = pmConfigDB(config->modules);
+    if (!config->dbh) {
+        psError(PS_ERR_UNKNOWN, false, "Can't configure database");
+        exit(EXIT_FAILURE);
+    }
 
     return config;