Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 33439)
+++ trunk/ippTools/share/Makefile.am	(revision 33525)
@@ -8,6 +8,4 @@
 	addtool_find_cam_id_dvo.sql \
 	addtool_find_cam_id.sql \
-	addtool_find_sky_id_dvo.sql \
-	addtool_find_sky_id.sql \
 	addtool_find_sky_id_multi_dvo.sql \
 	addtool_find_sky_id_multi.sql \
@@ -17,10 +15,8 @@
 	addtool_find_pendingexp_cam.sql \
 	addtool_find_pendingexp_stack.sql \
-	addtool_find_pendingexp_staticsky.sql \
 	addtool_find_pendingexp_staticsky_multi.sql \
 	addtool_find_pendingmergeprocess.sql \
 	addtool_find_processedexp_cam.sql \
 	addtool_find_processedexp_stack.sql \
-	addtool_find_processedexp_staticsky.sql \
 	addtool_find_processedexp_staticsky_multi.sql \
 	addtool_find_minidvodbprocessed.sql \
@@ -30,5 +26,4 @@
 	addtool_queue_cam_id.sql \
 	addtool_queue_stack_id.sql \
-	addtool_queue_sky_id.sql \
 	addtool_queue_sky_id_multi.sql \
 	addtool_queue_minidvodbrun.sql \
Index: trunk/ippTools/share/addtool_find_pendingexp_staticsky_multi.sql
===================================================================
--- trunk/ippTools/share/addtool_find_pendingexp_staticsky_multi.sql	(revision 33439)
+++ trunk/ippTools/share/addtool_find_pendingexp_staticsky_multi.sql	(revision 33525)
@@ -25,5 +25,5 @@
 WHERE
     staticskyRun.state = 'full'
-    AND stage = 'staticsky_multi'
+    AND stage = 'staticsky'
     AND ((addRun.state = 'new' AND addProcessedExp.add_id IS NULL) OR addRun.state = 'update')
     AND addRun.dvodb IS NOT NULL
Index: trunk/ippTools/share/addtool_find_sky_id.sql
===================================================================
--- trunk/ippTools/share/addtool_find_sky_id.sql	(revision 33439)
+++ trunk/ippTools/share/addtool_find_sky_id.sql	(revision 33525)
@@ -2,6 +2,6 @@
     staticskyRun.*
 FROM 
-     staticskyResult
-join staticskyRun using (sky_id)
+     staticskyRun
+join staticskyResult using (sky_id)
 join staticskyInput using(sky_id)
 JOIN stackRun USING(stack_id)
@@ -19,4 +19,4 @@
     staticskyRun.state = 'full'
     AND staticskyResult.quality = 0
-    AND added_exp_id IS NULL
+    AND added_sky_id IS NULL
     -- addtool adds checks on exposure being added to the dvodb previously
Index: trunk/ippTools/share/addtool_find_sky_id_dvo.sql
===================================================================
--- trunk/ippTools/share/addtool_find_sky_id_dvo.sql	(revision 33439)
+++ trunk/ippTools/share/addtool_find_sky_id_dvo.sql	(revision 33525)
@@ -1,12 +1,13 @@
-SELECT staticskyRun.* FROM staticskyResult
-JOIN staticskyRun USING(sky_id)
+SELECT staticskyRun.* FROM staticskyRun
+JOIN staticskyResult USING(sky_id)
 join staticskyInput using(sky_id)
 JOIN stackRun USING(stack_id)
 
 WHERE staticskyRun.state = 'full' and staticskyResult.quality = 0
-    AND sky_id NOT IN (SELECT sky_id
+    AND stack_id NOT IN (SELECT stack_id
        FROM addRun
        JOIN staticskyResult on staticskyResult.sky_id = addRun.stage_id
        JOIN staticskyRun USING(sky_id)
+       JOIN staticskyInput USING(sky_id)
        WHERE addRun.stage = 'staticsky' AND %s
       )
Index: trunk/ippTools/share/addtool_find_sky_id_multi.sql
===================================================================
--- trunk/ippTools/share/addtool_find_sky_id_multi.sql	(revision 33439)
+++ trunk/ippTools/share/addtool_find_sky_id_multi.sql	(revision 33525)
@@ -4,16 +4,16 @@
     staticskyResult.num_inputs
 FROM 
-     staticskyResult
-join staticskyRun using (sky_id)
+     staticskyRun
+join staticskyResult using (sky_id)
 join staticskyInput using(sky_id)
 JOIN stackRun USING(stack_id)
 
-LEFT JOIN (SELECT sky_id       AS added_sky_id,
+LEFT JOIN (SELECT stack_id       AS added_stack_id,
                   addRun.dvodb AS previous_dvodb
            FROM addRun
 JOIN staticskyRun on sky_id = stage_id
           ) as foo
-     ON sky_id = added_sky_id 
-     AND stage = 'staticsky_multi'
+     ON stack_id = added_stack_id 
+     AND stage = 'staticsky'
      -- hook for qualifying the join on the previous_dvodb
      AND %s
@@ -21,4 +21,4 @@
     staticskyRun.state = 'full'
     AND staticskyResult.quality = 0
-    AND added_exp_id IS NULL
+    AND added_stack_id IS NULL
     -- addtool adds checks on exposure being added to the dvodb previously
Index: trunk/ippTools/share/addtool_find_sky_id_multi_dvo.sql
===================================================================
--- trunk/ippTools/share/addtool_find_sky_id_multi_dvo.sql	(revision 33439)
+++ trunk/ippTools/share/addtool_find_sky_id_multi_dvo.sql	(revision 33525)
@@ -5,8 +5,9 @@
 
 WHERE staticskyRun.state = 'full' and staticskyResult.quality = 0
-    AND sky_id NOT IN (SELECT sky_id
+    AND stack_id NOT IN (SELECT stack_id
        FROM addRun
        JOIN staticskyResult on staticskyResult.sky_id = addRun.stage_id
        JOIN staticskyRun USING(sky_id)
-       WHERE addRun.stage = 'staticsky_multi' AND %s
+       JOIN staticskyInput USING(sky_id)
+       WHERE addRun.stage = 'staticsky' AND %s
       )
Index: trunk/ippTools/share/addtool_queue_sky_id_multi.sql
===================================================================
--- trunk/ippTools/share/addtool_queue_sky_id_multi.sql	(revision 33439)
+++ trunk/ippTools/share/addtool_queue_sky_id_multi.sql	(revision 33525)
@@ -2,5 +2,5 @@
     SELECT
         0,              -- add_id
-        'staticsky_multi',		-- stage
+        'staticsky',		-- stage
         sky_id,         -- stage_id
 	%d,		-- stage_extra1
Index: trunk/ippTools/share/addtool_revertprocessedexp_staticsky_multi.sql
===================================================================
--- trunk/ippTools/share/addtool_revertprocessedexp_staticsky_multi.sql	(revision 33439)
+++ trunk/ippTools/share/addtool_revertprocessedexp_staticsky_multi.sql	(revision 33525)
@@ -5,3 +5,3 @@
     AND addProcessedExp.fault != 0
     AND addRun.state = 'new'
-    AND addRun.stage = 'staticsky_multi'
+    AND addRun.stage = 'staticsky'