Changeset 35572 for trunk/ippTools/src/chiptool.c

Timestamp:

May 9, 2013, 2:53:54 PM (13 years ago)

Author:

bills

Message:

Change implementation of chiptool -definebyquery require label to be specified.
If -unique to queue new runs if one does not exist for the given label.
Previously it would not queue one if there was a run for the exposure
in any label.

File:

• trunk/ippTools/src/chiptool.c (modified) (2 diffs)

trunk/ippTools/src/chiptool.c

@@ -269 +269 @@
 
     PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", true, false);
-    PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
+    PXOPT_LOOKUP_STR(label, config->args, "-set_label", true, false);
     PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false);
     PXOPT_LOOKUP_STR(expgroup, config->args, "-set_expgroup", false, false);
@@ -298 +298 @@
     psFree(where);
 
+    psString labelHook = NULL;
     if (unique) {
-      psStringAppend(&query, "AND chip_id IS NULL");
+      psStringAppend(&labelHook, "\nAND chipRun.label = '%s'", label);
+      psStringAppend(&query, " AND chip_id IS NULL");
     }
     
-    if (!p_psDBRunQuery(config->dbh, query)) {
+    if (!p_psDBRunQueryF(config->dbh, query, labelHook ? labelHook : "")) {
         psError(PS_ERR_UNKNOWN, false, "database error");
         psFree(query);