Changeset 32422 for trunk/ippTools/share

Timestamp:

Sep 21, 2011, 11:11:16 AM (15 years ago)

Author:

watersc1

Message:

Update to LAP code.

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• laptool_WSdiff_check.sql (added)
• laptool_definerun.sql (modified) (2 diffs)
• laptool_pendingexp.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -424 +424 @@
         laptool_pendingexp.sql \
         laptool_pendingrun.sql \
+        laptool_WSdiff_check.sql \
         laptool_stacks.sql
 

trunk/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)

trunk/ippTools/share/laptool_pendingexp.sql

@@ -3 +3 @@
        lapRun.dist_group, lapRun.registered, lapRun.fault, lapRun.quick_sass_id, lapRun.final_sass_id,
        exp_id, chip_id, pair_id, private, pairwise, active, lapExp.data_state,
-       dateobs, object, comment
+       dateobs, object, comment,
+       chipRun.state AS chip_state
   FROM lapRun JOIN lapExp USING(lap_id)
   JOIN rawExp USING(exp_id,filter)
+  LEFT JOIN chipRun USING(exp_id,chip_id)
 WHERE active IS TRUE AND lapRun.fault = 0
 -- lap_id restriction here.