Changeset 28439 for branches/eam_branches/ipp-20100621/ippTools/share/pubtool_pending.sql

Timestamp:

Jun 23, 2010, 2:29:49 PM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20100621/ippTools/share/pubtool_pending.sql (modified) (1 diff)

branches/eam_branches/ipp-20100621/ippTools/share/pubtool_pending.sql

@@ -74 +74 @@
         AND publishRun.state = 'new'
         AND diffPhotRun.state IN ('full', 'cleaned', 'goto_cleaned')
-        AND (diffRun.diff_mode = 4 OR publishClient.magicked = 0) -- diffPhotRun doesn't respect magic
+        AND (diffPhotRun.magicked != 0 OR diffRun.diff_mode = 4 OR publishClient.magicked = 0)
         -- WHERE hook %s
 ) AS publishToDo