Index: trunk/ippTools/share/addtool_find_diff_id_dvo.sql
===================================================================
--- trunk/ippTools/share/addtool_find_diff_id_dvo.sql	(revision 37587)
+++ trunk/ippTools/share/addtool_find_diff_id_dvo.sql	(revision 37709)
@@ -4,7 +4,4 @@
 JOIN diffSkyfile using (diff_id, skycell_id) 
 JOIN diffRun using (diff_id)
-
-
-diffRun JOIN diffSkyfile using (diff_id)
 
 WHERE diffRun.state = 'full' and diffSkyfile.quality = 0
Index: trunk/ippTools/share/addtool_find_pendingexp_diff.sql
===================================================================
--- trunk/ippTools/share/addtool_find_pendingexp_diff.sql	(revision 37587)
+++ trunk/ippTools/share/addtool_find_pendingexp_diff.sql	(revision 37709)
@@ -2,6 +2,6 @@
     addRun.*,
     diffSkyfile.path_base as stageroot,
-    "NULL",
-    "NULL"
+    'GPC1' as camera,
+    'PS1' as telescope
 FROM addRun
 JOIN diffInputSkyfile
Index: trunk/ippTools/share/addtool_find_pendingexp_ff.sql
===================================================================
--- trunk/ippTools/share/addtool_find_pendingexp_ff.sql	(revision 37587)
+++ trunk/ippTools/share/addtool_find_pendingexp_ff.sql	(revision 37709)
@@ -1,7 +1,5 @@
    SELECT
     addRun.*,
-    fullForceResult.path_base as stageroot,
-    "NULL",
-    "NULL"
+    fullForceResult.path_base as stageroot
 FROM addRun
 JOIN fullForceResult
Index: trunk/ippTools/share/addtool_queue_diff_id.sql
===================================================================
--- trunk/ippTools/share/addtool_queue_diff_id.sql	(revision 37587)
+++ trunk/ippTools/share/addtool_queue_diff_id.sql	(revision 37709)
@@ -4,5 +4,5 @@
         'diff',		-- stage
         diff_id,        -- stage_id
-        diff_skyfile_id, -- stage_extra1
+        %d, -- stage_extra1
         '%s',           -- state
         '%s',           -- workdir
@@ -17,8 +17,7 @@
 	'%s',           -- minidvodb_group 
  	'%s'	        -- minidvodb_name
-    FROM diffInputSkyfile 
-    JOIN diffSkyfile using (diff_id, skycell_id)
-    JOIN diffRun using (diff_id)
+    FROM diffRun
     WHERE
-        diffRun.state = 'full' AND
+        diffRun.state = 'full' 
         AND diffRun.diff_id = %lld
+        
Index: trunk/ippTools/share/addtool_queue_ff_id.sql
===================================================================
--- trunk/ippTools/share/addtool_queue_ff_id.sql	(revision 37587)
+++ trunk/ippTools/share/addtool_queue_ff_id.sql	(revision 37709)
@@ -4,5 +4,5 @@
         'fullforce',		-- stage
         ff_id,         -- stage_id
-	warp_id,	-- stage_extra1
+        %d,	       -- stage_extra1
         '%s',           -- state
         '%s',           -- workdir
@@ -17,6 +17,5 @@
 	'%s',           -- minidvodb_group 
  	'%s'	        -- minidvodb_name
-    FROM fullForceResult
-    JOIN fullForceRun using (ff_id)
+    FROM fullForceRun
     WHERE
         fullForceRun.state = 'full'