Changeset 27840 for branches/simtest_nebulous_branches/ippTools/share/pubtool_pending.sql

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippTools/share/pubtool_pending.sql (modified) (2 diffs)

branches/simtest_nebulous_branches/ippTools/share/pubtool_pending.sql

@@ -24 +24 @@
     JOIN rawExp USING(exp_id)
     WHERE publishClient.stage = 'diff'
+        AND publishClient.active = 1
         AND publishRun.state = 'new'
         AND diffRun.state = 'full'
+        AND (diffRun.magicked > 0 OR diffRun.diff_mode = 4 OR publishClient.magicked = 0)
         -- WHERE hook %s
     UNION
@@ -43 +45 @@
     JOIN rawExp USING(exp_id)
     WHERE publishClient.stage = 'camera'
+        AND publishClient.active = 1
         AND publishRun.state ='new'
         AND camRun.state = 'full'
+        AND (camRun.magicked > 0 OR publishClient.magicked = 0)
         -- WHERE hook %s
 ) AS publishToDo