Changeset 35575

Timestamp:

May 10, 2013, 10:11:42 AM (13 years ago)

Author:

bills

Message:

change chiptool -definebyquery -unique to only demand uniqueness
for exp_id, label

Location:

tags/ipp-20130307/ippTools

Files:

• share/chiptool_find_rawexp.sql (modified) (1 diff, 1 prop)
• src/chiptool.c (modified) (2 diffs, 1 prop)

tags/ipp-20130307/ippTools/share/chiptool_find_rawexp.sql

@@ -6 +6 @@
 FROM rawExp
 JOIN newExp using (exp_id)
-LEFT JOIN chipRun USING (exp_id)
+LEFT JOIN chipRun ON chipRun.exp_id = rawExp.exp_id -- JOIN hook %s
 WHERE
     rawExp.fault = 0

tags/ipp-20130307/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);