Changeset 23688 for trunk/ippTools/share/magictool_definebyquery.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/magictool_definebyquery.sql (modified) (2 diffs)

trunk/ippTools/share/magictool_definebyquery.sql

@@ -45 +45 @@
 WHERE
     diffSkyfile.fault = 0
+    AND diffSkyfile.quality = 0
 -- WHERE hook %s
-AND exp_id = 36475
-AND diffRun.label = 'magic_2008-11-12'
+    AND exp_id = 36475
+    AND diffRun.label = 'magic_2008-11-12'
 GROUP BY
     exp_id,
@@ -79 +80 @@
     JOIN diffRun USING(diff_id)
     WHERE
-        warpSkyfile.ignored = 0
+        warpSkyfile.quality = 0
         -- magicSkycellNums WHERE hook %s
 AND exp_id = 36475