Changeset 7022

Timestamp:

May 1, 2006, 11:32:27 AM (20 years ago)

Author:

jhoblitt

Message:

update CLI options

File:

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

trunk/ippTools/src/guidetoolConfig.c

@@ -36 +36 @@
         "define camera of interest", "");
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-telescope",  0,
-        "define camera of interest", "");
+        "define telescope of interest", "");
     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_type",  0,
-        "define class", "");
-    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-class",  0,
-        "define class", "");
+        "define exposure type", "");
+    psMetadataAddS32(pendingArgs, PS_LIST_TAIL, "-imfiles",  0,
+        "define number of imfiles", 0);
+    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-filter",  0,
+        "define filter of interest", "");
+    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-stats",  0,
+        "define stats of interest", "");
+    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-recipe",  0,
+        "define recipe of interest", "");
+    psMetadataAddS32(pendingArgs, PS_LIST_TAIL, "-p1_version",  0,
+        "define p1_version of interest", 0);
 
     // -define inputs
@@ -46 +54 @@
     psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-exp_id",  0,
         "define class", "");
+    psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-inst",  0,
+        "define camera of interest", "");
+    psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-telescope",  0,
+        "define camera of interest", "");
+    psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-exp_type",  0,
+        "define class", "");
+    psMetadataAddS32(defineArgs, PS_LIST_TAIL, "-imfiles",  0,
+        "define number of imfiles", 0);
     psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-filter",  0,
         "define filter of interest", "");
-    psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-stat",  0,
-        "define URL", "");
+    psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-stats",  0,
+        "define stats of interest", "");
+    // these two are inputs NOT search parameters
     psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-recipe",  0,
-        "define URL", "");
-    psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-mosiac",  0,
-        "define URL", "");
+        "define recipe of interest", "");
+    psMetadataAddS32(defineArgs, PS_LIST_TAIL, "-p1_version",  0,
+        "define p1_version of interest", 0);
 
     // find which mode we're running under
@@ -131 +148 @@
 
     addWhereStr(exp_id);
+    // convert '-inst' to 'camera'
     if ((str = psMetadataLookupStr(&status, args, "-inst"))) {
         if (!psMetadataAddStr(where, PS_LIST_TAIL, "camera", 0, "==", str)) {
@@ -140 +158 @@
     addWhereStr(telescope);
     addWhereStr(exp_type);
-    if ((n = psMetadataLookupStr(&status, args, "-imfiles"))) {
+    if ((n = psMetadataLookupS32(&status, args, "-imfiles"))) {
         if (!psMetadataAddS32(where, PS_LIST_TAIL, "imfiles", 0, "==", n)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles");
@@ -150 +168 @@
     addWhereStr(stats);
     addWhereStr(recipe);
+    if ((n = psMetadataLookupS32(&status, args, "-p1_version"))) {
+        if (!psMetadataAddS32(where, PS_LIST_TAIL, "p1_version", 0, "==", n)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item p1_version");
+            psFree(where);
+            exit(EXIT_FAILURE);
+        }
+    }
 }