Changeset 25027 for branches/pap/ippTools/share/disttool_definebyquery_camera.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_camera.sql (modified) (2 diffs)

branches/pap/ippTools/share/disttool_definebyquery_camera.sql

@@ -1 @@
-SELECT
+SELECT DISTINCT
     'camera' as stage,
     camRun.cam_id as stage_id,
     rawExp.exp_name as run_tag,
-    rawExp.obs_mode,
+    distTarget.label,
     distTarget.target_id,
     distTarget.clean
@@ -9 +9 @@
 JOIN chipRun USING(chip_id)
 JOIN rawExp USING(exp_id)
-JOIN distTarget ON distTarget.stage = 'camera' AND rawExp.obs_mode = distTarget.obs_mode
+JOIN distTarget ON distTarget.stage = 'camera'
+    AND rawExp.filter = distTarget.filter
+    AND camRun.label  = distTarget.label
 JOIN rcInterest USING(target_id)
-LEFT JOIN distRun ON distRun.stage = 'camera' AND camRun.cam_id = distRun.stage_id
+LEFT JOIN distRun ON distRun.stage = 'camera' 
+    AND camRun.cam_id = distRun.stage_id
+    AND distRun.clean = distTarget.clean
     -- JOIN hook %s
 WHERE distTarget.state = 'enabled'