Changeset 33415 for branches/meh_branches/ppstack_test/ippTools/share/laptool_definerun.sql

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

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

branches/meh_branches/ppstack_test/ippTools/share/laptool_definerun.sql

@@ -1 @@
-SELECT DISTINCT want.exp_id, have.chip_id, false as private, true as active, false as pairwise
+SELECT DISTINCT 
+  want.exp_id, 
+  have.chip_id, 
+  COALESCE(have.private,false) as private, 
+  true as active, 
+  false as pairwise
   FROM
   (SELECT exp_id FROM rawExp 
@@ -8 +13 @@
   ) AS want
   LEFT JOIN 
-  (SELECT exp_id,MAX(chip_id) AS chip_id, chipRun.state
+  (SELECT 
+     exp_id,
+     MAX(chip_id) AS chip_id, 
+     chipRun.state,
+     lapExp.private
      FROM lapExp JOIN chipRun USING(exp_id,chip_id) 
-     where private IS FALSE 
-     AND chip_id IS NOT NULL
+     JOIN lapRun USING(lap_id)
+     where chip_id IS NOT NULL
      AND 
-         (
+-- This is the restriction to only draw from the current lapSequence
+     @CHIPWHERE@
+--       (
           -- (active = TRUE) OR 
-          (chipRun.state = 'full') OR
-          (chipRun.state = 'new')
+          -- (chipRun.state = 'full') OR
+          -- (chipRun.state = 'new')
           -- when we can do updates, put that here.
-          )
+--        )
      GROUP BY exp_id
 ) AS have USING(exp_id)