Changeset 23688 for trunk/ippTools/share/stacktool_definebyquery_part1.sql

Timestamp:

Apr 2, 2009, 2:51:37 PM (17 years ago)

Author:

Paul Price

Message:

Merging in branches/pap/ from r23685. Some conflicts, most notably in ippTools, but these resolved fairly simply. Only question mark is on regtool reversion, but I think I got it right. Everything builds fine.

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/share/stacktool_definebyquery_part1.sql (modified) (1 diff)

trunk/ippTools/share/stacktool_definebyquery_part1.sql

@@ -17 +17 @@
         COUNT(warpSkyfile.skycell_id) AS num_warp -- number of warps that can be stacked
     FROM warpRun
-        JOIN warpSkyfile USING(warp_id)
-        JOIN fakeRun USING(fake_id)
-        JOIN camRun USING(cam_id)
-        JOIN chipRun USING(chip_id)
-        JOIN rawExp USING(exp_id)
+    JOIN warpSkyfile USING(warp_id)
+    JOIN fakeRun USING(fake_id)
+    JOIN camRun USING(cam_id)
+    JOIN chipRun USING(chip_id)
+    JOIN rawExp USING(exp_id)
     WHERE
         warpRun.state = 'full'
-    AND warpSkyfile.ignored = 0
-    AND warpSkyfile.fault = 0
+        AND warpSkyfile.fault = 0
+        AND warpSkyfile.quality = 0
     -- Here should follow the SQL in stacktool_definebyquery_part2.sql,
     -- after any additional WHERE conditions have been added