Changeset 27840 for branches/simtest_nebulous_branches/ippTools/share/disttool_definebyquery_camera.sql

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippTools/share/disttool_definebyquery_camera.sql (modified) (2 diffs)

branches/simtest_nebulous_branches/ippTools/share/disttool_definebyquery_camera.sql

@@ -3 +3 @@
     camRun.cam_id as stage_id,
     rawExp.exp_name as run_tag,
-    distTarget.label,
+    camRun.magicked,
+    camRun.label,
+    camRun.data_group,
+    distTarget.dist_group,
     distTarget.target_id,
     distTarget.clean
@@ -11 +14 @@
 JOIN distTarget ON distTarget.stage = 'camera'
     AND rawExp.filter = distTarget.filter
-    AND camRun.label  = distTarget.label
+    AND camRun.dist_group  = distTarget.dist_group
 JOIN rcInterest USING(target_id)
-LEFT JOIN distRun ON distRun.stage = 'camera' 
-    AND camRun.cam_id = distRun.stage_id
-    AND distRun.clean = distTarget.clean
+LEFT JOIN distRun ON camRun.cam_id = distRun.stage_id
+    AND distRun.target_id = distTarget.target_id
     -- JOIN hook %s
 WHERE distTarget.state = 'enabled'