Changeset 32451

Timestamp:

Sep 26, 2011, 11:37:59 AM (15 years ago)

Author:

heather

Message:

This fixes a bug that if a selection of camRuns which has multiple cam_ids
pointing to the same exp_id (with that exp_id not in the addRun dvodb) it will
queue all of the cam_ids, because it hasn't processed that exp_id. The fix
limits it to 1 of those. I also fixed staticsky which would have the same
problem.

File:

• trunk/ippTools/src/addtool.c (modified) (1 diff)

trunk/ippTools/src/addtool.c

@@ -280 +280 @@
 
     }
+
+    //if we grab a group of camRun/stackRuns that have multiple camRun/stackRun pointing to the same exp_id/stack_id, and that exp_id/stack_id has never before been added to addRun, we need to group by exp_id/stack_id to ensure that only 1 of the camRun/stackRun for that exp_id is added to the addRun stage.
+
+    if (strcmp(stage,"cam") == 0) {
+        psStringAppend(&query, " GROUP BY exp_id"); 
+   }
+      if (strcmp(stage,"stack") == 0) {
+        psStringAppend(&query, " GROUP BY stack_id");
+      }
+    if (strcmp(stage,"staticsky") == 0) {
+        psStringAppend(&query, " GROUP BY stack_id");
+      }
+
+
 
     psTrace("addtool.c", PS_LOG_INFO,"query: \n\n%s\n\n",query);