Changeset 24664 for trunk/ippTools/share

Timestamp:

Jul 3, 2009, 11:48:59 AM (17 years ago)

Author:

eugene

Message:

fix definebyquery insert sql so it can handle SQL wildcards; add -pretend mode to definebyquery

Location:

trunk/ippTools/share

Files:

• stacktool_definebyquery_insert.sql (modified) (2 diffs)
• stacktool_definebyquery_insert_random_part1.sql (modified) (2 diffs)
• stacktool_definebyquery_insert_random_part2.sql (modified) (1 diff)

trunk/ippTools/share/stacktool_definebyquery_insert.sql

@@ -12 +12 @@
 JOIN camRun
     USING(cam_id)
+JOIN camProcessedExp
+    USING(cam_id)
 JOIN chipRun
     USING(chip_id)
@@ -17 +19 @@
     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

trunk/ippTools/share/stacktool_definebyquery_insert_random_part1.sql

@@ -19 +19 @@
     JOIN camRun
         USING(cam_id)
+    JOIN camProcessedExp
+        USING(cam_id)
     JOIN chipRun
         USING(chip_id)
@@ -24 +26 @@
         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

trunk/ippTools/share/stacktool_definebyquery_insert_random_part2.sql

@@ -5 +5 @@
     -- to get a random set of N.
     ORDER BY rnd_num
-    LIMIT %d
+    LIMIT @RANDOM_LIMIT@
 ) AS randomWarps