Changeset 26179 for trunk/ippTools/share/difftool_inputskyfile.sql

Timestamp:

Nov 18, 2009, 9:24:35 AM (16 years ago)

Author:

bills

Message:

Don't require that chipRun, camRun and fakeRun be full. All we need is the warp to be full

File:

• trunk/ippTools/share/difftool_inputskyfile.sql (modified) (4 diffs)

trunk/ippTools/share/difftool_inputskyfile.sql

@@ -27 +27 @@
     JOIN chipRun
         USING(chip_id)
-    JOIN chipProcessedImfile
-        USING(chip_id)
     JOIN rawExp
-        ON chipRun.exp_id = rawExp.exp_id
+        USING(exp_id)
     WHERE
-        -- diffRun.state = 'new' AND 
-        warpRun.state = 'full'
-        AND warpRun.state = 'full'
-        AND fakeRun.state = 'full'
-        AND camRun.state = 'full'
-        AND chipRun.state = 'full'
+        (diffRun.state = 'new' or diffRun.state = 'full')
+        AND (warpRun.state = 'full')
         -- where hook %s
     UNION
@@ -67 +61 @@
     JOIN chipRun
         USING(chip_id)
-    JOIN chipProcessedImfile
-        USING(chip_id)
     JOIN rawExp
-        ON chipRun.exp_id = rawExp.exp_id
+        USING(exp_id)
     WHERE
-        -- diffRun.state = 'new' AND 
-        warpRun.state = 'full'
-        AND fakeRun.state = 'full'
-        AND camRun.state = 'full'
-        AND chipRun.state = 'full'
+        (diffRun.state = 'new' or diffRun.state = 'full')
+        AND (warpRun.state = 'full')
         -- where hook %s
     UNION
@@ -107 +96 @@
         USING(chip_id)
     JOIN rawExp
-        ON chipRun.exp_id = rawExp.exp_id
+        USING(exp_id)
     WHERE
         (diffRun.state = 'new' or diffRun.state = 'full')
@@ -140 +129 @@
         USING(chip_id)
     JOIN rawExp
-        ON chipRun.exp_id = rawExp.exp_id
+        USING(exp_id)
     WHERE
         (diffRun.state = 'new' or diffRun.state = 'full')