Changeset 27840 for branches/simtest_nebulous_branches/ippTools/share/pubtool_definerun.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_definerun.sql (modified) (2 diffs)

branches/simtest_nebulous_branches/ippTools/share/pubtool_definerun.sql

@@ -2 +2 @@
 SELECT
     client_id,
-    stage_id
+    stage_id,
+    src_label
 FROM (
     -- Get diffs to publish
     SELECT
         client_id,
-        diff_id AS stage_id
+        diff_id AS stage_id,
+        label AS src_label
     FROM publishClient
     JOIN diffRun
     WHERE publishClient.stage = 'diff'
+        AND publishClient.active = 1
         AND diffRun.state = 'full'
+        AND (diffRun.magicked > 0 OR diffRun.diff_mode = 4 OR publishClient.magicked = 0)
     -- WHERE hook %s
     UNION
@@ -17 +21 @@
     SELECT
         client_id,
-        cam_id AS stage_id
+        cam_id AS stage_id,
+        label AS src_label
     FROM publishClient
     JOIN camRun
     WHERE publishClient.stage = 'camera'
+        AND publishClient.active = 1
         AND camRun.state = 'full'
+        AND (camRun.magicked > 0 OR publishClient.magicked = 0)
     -- WHERE hook %s
     ) AS publishToDo