Index: trunk/ippTools/share/stacktool_definebyquery_insert.sql
===================================================================
--- trunk/ippTools/share/stacktool_definebyquery_insert.sql	(revision 24659)
+++ trunk/ippTools/share/stacktool_definebyquery_insert.sql	(revision 24664)
@@ -12,4 +12,6 @@
 JOIN camRun
     USING(cam_id)
+JOIN camProcessedExp
+    USING(cam_id)
 JOIN chipRun
     USING(chip_id)
@@ -17,7 +19,7 @@
     USING(exp_id)
 WHERE
-    warpSkyfile.skycell_id = '%s'
+    warpSkyfile.skycell_id = '@SKYCELL_ID@'
     AND warpRun.state = 'full'
-    AND rawExp.filter = '%s'
+    AND rawExp.filter = '@FILTER@'
     AND warpSkyfile.fault = 0
     AND warpSkyfile.quality = 0
Index: trunk/ippTools/share/stacktool_definebyquery_insert_random_part1.sql
===================================================================
--- trunk/ippTools/share/stacktool_definebyquery_insert_random_part1.sql	(revision 24659)
+++ trunk/ippTools/share/stacktool_definebyquery_insert_random_part1.sql	(revision 24664)
@@ -19,4 +19,6 @@
     JOIN camRun
         USING(cam_id)
+    JOIN camProcessedExp
+        USING(cam_id)
     JOIN chipRun
         USING(chip_id)
@@ -24,7 +26,7 @@
         USING(exp_id)
     WHERE
-        skycell_id = '%s'
+        skycell_id = '@SKYCELL_ID@'
         AND warpRun.state = 'full'
-        AND rawExp.filter = '%s' -- the result of the query is grouped by filter and inserted for one at a time
+        AND rawExp.filter = '@FILTER@' -- the result of the query is grouped by filter and inserted for one at a time
         AND warpSkyfile.fault = 0
         AND warpSkyfile.quality = 0
Index: trunk/ippTools/share/stacktool_definebyquery_insert_random_part2.sql
===================================================================
--- trunk/ippTools/share/stacktool_definebyquery_insert_random_part2.sql	(revision 24659)
+++ trunk/ippTools/share/stacktool_definebyquery_insert_random_part2.sql	(revision 24664)
@@ -5,4 +5,4 @@
     -- to get a random set of N.
     ORDER BY rnd_num
-    LIMIT %d
+    LIMIT @RANDOM_LIMIT@
 ) AS randomWarps