Changeset 7024

Timestamp:

May 1, 2006, 1:42:48 PM (20 years ago)

Author:

jhoblitt

Message:

attempt to fix where claus generation

File:

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

trunk/ippTools/src/guidetoolConfig.c

@@ -132 +132 @@
     // setup search criterion
 #define addWhereStr(name) \
-    if ((str = psMetadataLookupStr(&status, args, "-" #name))) { \
+    if ((str = psMetadataLookupStr(&status, argSet, "-" #name))) { \
         if (!psMetadataAddStr(where, PS_LIST_TAIL, #name, 0, "==", str)) {\
             psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
@@ -147 +147 @@
     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'
-    if ((str = psMetadataLookupStr(&status, args, "-inst"))) {
+    if ((str = psMetadataLookupStr(&status, argSet, "-inst"))) {
         if (!psMetadataAddStr(where, PS_LIST_TAIL, "camera", 0, "==", str)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item camera");
@@ -158 +165 @@
     addWhereStr(telescope);
     addWhereStr(exp_type);
-    if ((n = psMetadataLookupS32(&status, args, "-imfiles"))) {
+    if ((n = psMetadataLookupS32(&status, argSet, "-imfiles"))) {
         if (!psMetadataAddS32(where, PS_LIST_TAIL, "imfiles", 0, "==", n)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item imfiles");
@@ -168 +175 @@
     addWhereStr(stats);
     addWhereStr(recipe);
-    if ((n = psMetadataLookupS32(&status, args, "-p1_version"))) {
+    if ((n = psMetadataLookupS32(&status, argSet, "-p1_version"))) {
         if (!psMetadataAddS32(where, PS_LIST_TAIL, "p1_version", 0, "==", n)) {
             psError(PS_ERR_UNKNOWN, false, "failed to add item p1_version");