Changeset 36668 for trunk/ippTools/share

Timestamp:

Apr 15, 2014, 3:49:31 PM (12 years ago)

Author:

bills

Message:

disttool -definebyquery -rerun didn't work

Location:

trunk/ippTools/share

Files:

• disttool_definebyquery_SSdiff.sql (modified) (1 diff)
• disttool_definebyquery_camera.sql (modified) (1 diff)
• disttool_definebyquery_chip_bg.sql (modified) (1 diff)
• disttool_definebyquery_diff.sql (modified) (1 diff)
• disttool_definebyquery_fake.sql (modified) (1 diff)
• disttool_definebyquery_ff.sql (modified) (1 diff)
• disttool_definebyquery_raw.sql (modified) (1 diff)
• disttool_definebyquery_sky.sql (modified) (1 diff)
• disttool_definebyquery_sky_singlefilter.sql (modified) (1 diff)
• disttool_definebyquery_skycal.sql (modified) (2 diffs)
• disttool_definebyquery_stack.sql (modified) (1 diff)
• disttool_definebyquery_warp.sql (modified) (1 diff)
• disttool_definebyquery_warp_bg.sql (modified) (1 diff)

trunk/ippTools/share/disttool_definebyquery_SSdiff.sql

@@ -22 +22 @@
       AND distTarget.state = 'enabled'
       AND rcInterest.state = 'enabled'
-      AND distRun.dist_id IS NULL
-
       AND ((diffRun.state = 'full') OR (distTarget.clean AND diffRun.state = 'cleaned'))

trunk/ippTools/share/disttool_definebyquery_camera.sql

@@ -21 +21 @@
 WHERE distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL      -- no existing distRun 
     AND ((camRun.state = 'full') OR (distTarget.clean AND camRun.state = 'cleaned'))

trunk/ippTools/share/disttool_definebyquery_chip_bg.sql

@@ -23 +23 @@
 WHERE distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL      -- no existing distRun
     AND ((chipBackgroundRun.state = 'full') OR (distTarget.clean AND chipBackgroundRun.state = 'cleaned'))

trunk/ippTools/share/disttool_definebyquery_diff.sql

@@ -25 +25 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND ((diffRun.state = 'full') OR (distTarget.clean AND diffRun.state = 'cleaned'))
 

trunk/ippTools/share/disttool_definebyquery_fake.sql

@@ -20 +20 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND ((fakeRun.state = 'full') OR (distTarget.clean AND fakeRun.state = 'cleaned'))

trunk/ippTools/share/disttool_definebyquery_ff.sql

@@ -21 +21 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND fullForceRun.state = 'full'
     AND stackRun.filter = distTarget.filter

trunk/ippTools/share/disttool_definebyquery_raw.sql

@@ -16 +16 @@
 JOIN rcInterest USING(target_id)
 LEFT JOIN distRun ON distRun.stage_id = exp_id AND distRun.target_id = distTarget.target_id
-WHERE distRun.dist_id IS NULL           -- no existing distRun for this exposure
-    AND distTarget.state = 'enabled'    -- target and intrest are enabled
+WHERE distTarget.state = 'enabled'    -- target and intrest are enabled
     AND rcInterest.state = 'enabled'
     AND magicDSRun.state = 'full'       -- destreaked files are available

trunk/ippTools/share/disttool_definebyquery_sky.sql

@@ -23 +23 @@
     AND rcInterest.state = 'enabled'
     AND distTarget.filter = 'multi'
-    AND distRun.dist_id IS NULL
     AND ((staticskyRun.state = 'full') OR (distTarget.clean AND staticskyRun.state = 'cleaned'))
     -- we shouldn't need to check fault. If faulted it shouldn't be full

trunk/ippTools/share/disttool_definebyquery_sky_singlefilter.sql

@@ -22 +22 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND ((staticskyRun.state = 'full') OR (distTarget.clean AND staticskyRun.state = 'cleaned'))
     AND stackRun.filter = distTarget.filter

trunk/ippTools/share/disttool_definebyquery_skycal.sql

@@ -1 @@
-SELECT
+SELECT DISTINCT
     'skycal' as stage,
     skycalRun.skycal_id AS stage_id,
@@ -21 +21 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND ((skycalRun.state = 'full') OR (distTarget.clean AND skycalRun.state = 'cleaned'))
     AND stackRun.filter = distTarget.filter

trunk/ippTools/share/disttool_definebyquery_stack.sql

@@ -21 +21 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND ((stackRun.state = 'full') OR (distTarget.clean AND stackRun.state = 'cleaned'))
     -- we shouldn't need to check fault. If faulted it shouldn't be full

trunk/ippTools/share/disttool_definebyquery_warp.sql

@@ -22 +22 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND ((warpRun.state = 'full') OR (distTarget.clean AND warpRun.state = 'cleaned'))
 

trunk/ippTools/share/disttool_definebyquery_warp_bg.sql

@@ -24 +24 @@
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL
     AND ((warpBackgroundRun.state = 'full') OR (distTarget.clean AND warpBackgroundRun.state = 'cleaned'))