Changeset 24427 for branches/pap_mops/ippTools/share/pubtool_pending.sql

Timestamp:

Jun 15, 2009, 5:28:09 PM (17 years ago)

Author:

Paul Price

Message:

Adding script to do the actual publishing to DataStore. Decided to bundle all components into the same script (we're working with detections, it's serial, should be fast) to simply things (can remove the 'advance' mode for pubtool). Everything compiles, not tested yet.

File:

• branches/pap_mops/ippTools/share/pubtool_pending.sql (modified) (3 diffs)

branches/pap_mops/ippTools/share/pubtool_pending.sql

@@ -1 +1 @@
 SELECT
-    publishRun.pub_id,
-    publishRun.stage_id,
-    publishClient.destination,
-    publishClient.stage,
-    publishClient.format,
-    publishToDo.component
-FROM publishRun
-JOIN publishClient USING(client_id)
-JOIN ((
+    publishToDo.*
+FROM ((
     SELECT
-        pub_id,
-        diff_id AS stage_id,
-        skycell_id AS component
+        publishRun.pub_id,
+        publishClient.product,
+        publishClient.stage,
+        diffRun.diff_id AS stage_id,
+        publishRun.workdir
     FROM publishRun
     JOIN publishClient USING(client_id)
@@ -19 +14 @@
     JOIN diffSkyfile USING(diff_id)
     WHERE publishClient.stage = 'diff'
+        AND publishRun.state = 'new'
+        AND diffRun.state = 'full'
     ) AS publishDiffs UNION (
     SELECT
-        pub_id,
-        cam_id AS stage_id,
-        NULL AS component
+        publishRun.pub_id,
+        publishClient.product,
+        publishClient.stage,
+        camRun.cam_id AS stage_id,
+        publishRun.workdir
     FROM publishRun
     JOIN publishClient USING(client_id)
@@ -29 +28 @@
         ON camRun.cam_id = publishRun.stage_id
     WHERE publishClient.stage = 'camera'
+        AND publishRun.state ='new'
+        AND camRun.state = 'full'
     ) AS publishCams
-) AS publishToDo USING(pub_id, stage_id)
-LEFT JOIN publishFile USING(pub_id, component)
-WHERE publishRun.state = 'new'
-    AND publishFile.pub_id IS NULL
+) AS publishToDo
+LEFT JOIN publishDone USING(pub_id)
+WHERE publishDone.pub_id IS NULL