Changeset 32710

Timestamp:

Nov 18, 2011, 2:33:52 PM (15 years ago)

Author:

bills

Message:

Don't try and distribute raw files that have been ignored

Location:

trunk/ippTools/share

Files:

• disttool_pending_raw.sql (modified) (3 diffs)
• disttool_toadvance.sql (modified) (1 diff)

trunk/ippTools/share/disttool_pending_raw.sql

@@ -43 +43 @@
     -- AND (rawExp.magicked OR distRun.no_magic)
     AND rawExp.magicked
+    AND rawImfile.ignored = 0
     -- need to have magicked the chip image which makes the camera mask
     AND chipProcessedImfile.magicked != 0
@@ -86 +87 @@
     AND distComponent.dist_id IS NULL
     AND (distRun.no_magic)
+    AND rawImfile.ignored = 0
     AND (Label.active OR Label.active IS NULL)
 UNION
@@ -131 +133 @@
     AND chipProcessedImfile.magicked != 0
     AND camRun.magicked > 0 
+    AND rawImfile.ignored = 0
     AND (Label.active OR Label.active IS NULL)
 UNION

trunk/ippTools/share/disttool_toadvance.sql

@@ -26 +26 @@
         AND distRun.fault = 0
         AND distRun.stage = 'raw'
+        AND rawImfile.ignored = 0
     GROUP BY
         distRun.dist_id,