Changeset 25027 for branches/pap/ippTools/share/disttool_definebyquery_stack.sql

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippTools/share/disttool_definebyquery_stack.sql (modified) (1 diff)

branches/pap/ippTools/share/disttool_definebyquery_stack.sql

@@ -3 +3 @@
     stackRun.stack_id AS stage_id,
     -- run tag in the form 'stack.$skycell_id.$stack_id'
-    CONCAT('stack.', stackRun.skycell_id, '.', convert(stackRun.stack_id, CHAR)) as run_tag,
-    rawExp.obs_mode,
+    CONCAT_WS('.', 'stack', stackRun.skycell_id, convert(stackRun.stack_id, CHAR)) as run_tag,
+    distTarget.label,
     distTarget.target_id,
     distTarget.clean
 FROM stackRun
-JOIN stackInputSkyfile using(stack_id)
-JOIN warpRun USING(warp_id)
-JOIN fakeRun USING(fake_id)
-JOIN camRun USING(cam_id)
-JOIN chipRun USING(chip_id)
-JOIN rawExp USING(exp_id)
-JOIN distTarget ON distTarget.stage = 'stack' AND rawExp.obs_mode = distTarget.obs_mode
+JOIN distTarget ON distTarget.stage = 'stack'
+    AND stackRun.label = distTarget.label
+    AND stackRun.filter = distTarget.filter
 JOIN rcInterest USING(target_id)
 LEFT JOIN distRun ON distRun.stage = 'stack' AND (distRun.stage_id = stack_id)
+    AND distRun.clean = distTarget.clean
     -- JOIN hook %s
 WHERE  distTarget.state = 'enabled'