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

branches/simtest_nebulous_branches/ippTools/share/disttool_definebyquery_chip.sql

@@ -2 +2 @@
     'chip' as stage,
     chipRun.chip_id as stage_id,
+    chipRun.magicked,
     rawExp.exp_name as run_tag,
     chipRun.label,
+    chipRun.data_group,
+    chipRun.dist_group,
     distTarget.target_id,
     distTarget.clean
@@ -9 +12 @@
 JOIN rawExp USING(exp_id)
 JOIN distTarget ON distTarget.stage = 'chip'
-    AND chipRun.label = distTarget.label 
+    AND chipRun.dist_group = distTarget.dist_group 
     AND rawExp.filter = distTarget.filter
 JOIN rcInterest USING(target_id)
-LEFT JOIN distRun ON distRun.stage = 'chip' 
-    AND distRun.stage_id = chipRun.chip_id
-    AND distRun.clean = distTarget.clean
+LEFT JOIN distRun ON distRun.stage_id = chipRun.chip_id
+    AND distRun.target_id = distTarget.target_id
     -- JOIN hook %s
 WHERE distTarget.state = 'enabled'