Changeset 25835 for trunk/ippTools/src/addtool.c

Timestamp:

Oct 14, 2009, 11:06:18 AM (17 years ago)

Author:

bills

Message:

Add data_group, dist_group, and note to the pipeline. These new columns will be used
for some of the tasks that label was used previously.

File:

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

trunk/ippTools/src/addtool.c

@@ -111 +111 @@
     PXOPT_LOOKUP_STR(dvodb,       config->args, "-set_dvodb", false, false);
     PXOPT_LOOKUP_STR(label,       config->args, "-set_label", false, false);
+    PXOPT_LOOKUP_STR(data_group,  config->args, "-set_data_group", false, false);
     PXOPT_LOOKUP_STR(reduction,   config->args, "-set_reduction", false, false);
+    PXOPT_LOOKUP_STR(note,        config->args, "-set_note", false, false);
     PXOPT_LOOKUP_BOOL(image_only, config->args, "-image_only", false);
     PXOPT_LOOKUP_BOOL(pretend,    config->args, "-pretend", false);
@@ -216 +218 @@
                                reduction   ? reduction : row->reduction,
                                label       ? label     : row->label,
+                               data_group  ? data_group : (label ? label : row->label),
                                dvodb       ? dvodb     : row->dvodb,
+                               note        ? note      : NULL,
                                image_only
         )) {
@@ -253 +257 @@
     PXOPT_COPY_STR(config->args, where, "-reduction", "addRun.reduction", "==");
 
-    if (!psListLength(where->list)
-        && !psMetadataLookupBool(NULL, config->args, "-all")) {
+    if (!psListLength(where->list)) {
         psFree(where);
         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
@@ -260 +263 @@
     }
 
+    psString query = psStringCopy("UPDATE addRun JOIN camRun USING(cam_id) JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id)");
+
+    // pxUpdateRun gets parameters from config->args and runs the update query
+    bool result = pxUpdateRun(config, where, &query, false);
+
+    psFree(query);
+    psFree(where);
+
+    return result;
+
+
+#ifdef notdef
     PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
     PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
@@ -288 +303 @@
 
     return true;
+#endif
 }