Changeset 27840 for branches/simtest_nebulous_branches/ippTools/share/disttool_definebyquery_warp.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_warp.sql (modified) (2 diffs)

branches/simtest_nebulous_branches/ippTools/share/disttool_definebyquery_warp.sql

@@ -2 +2 @@
     'warp' as stage,
     warpRun.warp_id AS stage_id,
+    warpRun.magicked,
     rawExp.exp_name as run_tag,
-    distTarget.label,
+    warpRun.label,
+    warpRun.data_group,
+    distTarget.dist_group,
     distTarget.target_id,
     distTarget.clean
@@ -12 +15 @@
 JOIN rawExp USING(exp_id)
 JOIN distTarget ON distTarget.stage = 'warp' 
-    AND warpRun.label = distTarget.label
+    AND warpRun.dist_group = distTarget.dist_group
     AND rawExp.filter = distTarget.filter
 JOIN rcInterest USING(target_id)
-LEFT JOIN distRun ON distRun.stage = 'warp' AND (distRun.stage_id = warp_id)
-    AND distRun.clean = distTarget.clean
+LEFT JOIN distRun ON (distRun.stage_id = warp_id)
+    AND distRun.target_id = distTarget.target_id
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'