Changeset 18337 for trunk/ippTools/src/camtool.c

Timestamp:

Jun 26, 2008, 4:08:21 PM (18 years ago)

Author:

jhoblitt

Message:

fix -definebyquery requiring set_* options and SQL generation issues

File:

• trunk/ippTools/src/camtool.c (modified) (3 diffs)

trunk/ippTools/src/camtool.c

@@ -146 +146 @@
     }
 
-    PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", true, false);
-    PXOPT_LOOKUP_STR(label, config->args, "-set_label", true, false);
-    PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", true, false);
-    PXOPT_LOOKUP_STR(expgroup, config->args, "-set_expgroup", true, false);
-    PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb", true, false);
-    PXOPT_LOOKUP_STR(tess_id, config->args, "-set_tess_id", true, false);
-    PXOPT_LOOKUP_STR(end_stage, config->args, "-set_end_stage", true, false);
+    PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", false, false);
+    PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
+    PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false);
+    PXOPT_LOOKUP_STR(expgroup, config->args, "-set_expgroup", false, false);
+    PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb", false, false);
+    PXOPT_LOOKUP_STR(tess_id, config->args, "-set_tess_id", false, false);
+    PXOPT_LOOKUP_STR(end_stage, config->args, "-set_end_stage", false, false);
 
     // find the exp_id of all the exposures that we want to queue up.
@@ -163 +163 @@
 
     if (where && psListLength(where->list)) {
-        psString whereClause = psDBGenerateWhereConditionSQL(where, "");
-        psStringAppend(&query, " AND %s", whereClause);
+        psString whereClause = psDBGenerateWhereSQL(where, NULL);
+        psStringAppend(&query, "%s", whereClause);
         psFree(whereClause);
     }
@@ -217 +217 @@
                     workdir     ? workdir   : row->workdir,
                     label       ? label     : row->label,
-                    reduction      ? reduction    : row->reduction,
+                    reduction   ? reduction : row->reduction,
                     expgroup    ? expgroup  : row->expgroup,
                     dvodb       ? dvodb     : row->dvodb,