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

trunk/ippTools/share/disttool_toadvance.sql

@@ -7 +7 @@
     (
 -- raw stage
-SELECT 
+SELECT
     distRun.dist_id,
     stage,
@@ -29 +29 @@
 UNION
 -- chip stage
-SELECT 
+SELECT
     distRun.dist_id,
     stage,
@@ -51 +51 @@
 UNION
 -- warp stage
-SELECT 
+SELECT
     distRun.dist_id,
     stage,
@@ -66 +66 @@
         AND distRun.stage = 'warp'
 --        AND warpSkyfile.fault = 0
---        AND warpSkyfile.ignored = 0
+--        AND warpSkyfile.quality = 0
     GROUP BY
         distRun.dist_id,
@@ -99 +99 @@
 UNION
 -- stack stage
-SELECT 
+SELECT
     distRun.dist_id,
     stage,