Changeset 29359

Timestamp:

Oct 8, 2010, 11:18:48 AM (16 years ago)

Author:

bills

Message:

implement ordering of files to destreak by Label.priority, some property changes for previously committed files

Location:

tags/ipp-20100823/ippTools

Files:

• share (modified) (1 prop)
• share/magicdstool_todestreak_camera.sql (modified) (3 diffs)
• share/magicdstool_todestreak_chip.sql (modified) (3 diffs)
• share/magicdstool_todestreak_diff.sql (modified) (6 diffs)
• share/magicdstool_todestreak_raw.sql (modified) (1 diff)
• share/magicdstool_todestreak_warp.sql (modified) (3 diffs)
• share/pubtool_pending.sql (modified) (1 prop)
• share/pubtool_revert.sql (modified) (1 diff)
• share/pxadmin_create_tables.sql (modified) (1 prop)
• share/warptool_scmap.sql (modified) (1 prop)
• src/magicdstool.c (modified) (1 diff, 1 prop)

tags/ipp-20100823/ippTools/share/magicdstool_todestreak_camera.sql

@@ -19 +19 @@
     recoveryroot,
     re_place,
-    remove
+    remove,
+    IFNULL(Label.priority, 10000) AS priority
 FROM magicDSRun
 JOIN magicMask USING (magic_id)
@@ -29 +30 @@
 LEFT JOIN magicDSFile
     ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+LEFT JOIN Label ON magicDSRun.label = Label.label
 WHERE
     magicDSRun.state = 'new'
@@ -38 +40 @@
     AND camProcessedExp.quality = 0
     AND magicDSFile.component IS NULL
+    AND (Label.active OR Label.active IS NULL)

tags/ipp-20100823/ippTools/share/magicdstool_todestreak_chip.sql

@@ -19 +19 @@
     recoveryroot,
     re_place,
-    remove
+    remove,
+    IFNULL(Label.priority, 10000) AS priority
 FROM magicDSRun
 JOIN magicMask USING (magic_id)
@@ -31 +32 @@
     ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
     AND magicDSFile.component = chipProcessedImfile.class_id
+LEFT JOIN Label
+    ON magicDSRun.label = Label.label
 WHERE
     magicDSRun.state = 'new'
@@ -38 +41 @@
     AND chipProcessedImfile.quality = 0
     AND magicDSFile.component IS NULL
+    AND (Label.active OR Label.active IS NULL)

tags/ipp-20100823/ippTools/share/magicdstool_todestreak_diff.sql

@@ -20 +20 @@
     recoveryroot,
     re_place,
-    remove
+    remove,
+    IFNULL(Label.priority, 10000) AS priority
 FROM rawExp
 JOIN magicRun USING (exp_id)
@@ -33 +34 @@
     ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
     AND magicDSFile.component = diffSkyfile.skycell_id
+LEFT JOIN Label ON magicDSRun.label = Label.label
 WHERE
     magicDSRun.state = 'new'
@@ -40 +42 @@
     AND diffSkyfile.quality = 0
     AND magicDSFile.component IS NULL
+    AND (Label.active OR Label.active IS NULL)
 -- bothways diffSkyfiles
 UNION
@@ -62 +65 @@
     recoveryroot,
     re_place,
-    remove
+    remove,
+    IFNULL(Label.priority, 10000) AS priority
 FROM rawExp
 JOIN magicRun USING (exp_id)
@@ -75 +79 @@
     ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
     AND magicDSFile.component = diffSkyfile.skycell_id
+LEFT JOIN Label ON magicDSRun.label = Label.label
 WHERE
     magicDSRun.state = 'new'
@@ -82 +87 @@
     AND diffSkyfile.quality = 0
     AND magicDSFile.component IS NULL
+    AND (Label.active OR Label.active IS NULL)
 ) AS magicDSRun
 -- we need the following so this query is compatible with the other stages

tags/ipp-20100823/ippTools/share/magicdstool_todestreak_raw.sql

@@ -20 +20 @@
     recoveryroot,
     re_place,
-    remove
+    remove,
+    10000 AS priority
 FROM magicDSRun
 JOIN magicMask USING (magic_id)

tags/ipp-20100823/ippTools/share/magicdstool_todestreak_warp.sql

@@ -19 +19 @@
     recoveryroot,
     re_place,
-    remove
+    remove,
+    IFNULL(Label.priority, 10000) AS priority
 FROM magicDSRun
 JOIN magicMask USING (magic_id)
@@ -29 +30 @@
     ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
     AND magicDSFile.component = warpSkyfile.skycell_id
+LEFT JOIN Label ON magicDSRun.label = Label.label
 WHERE
     magicDSRun.state = 'new'
@@ -36 +38 @@
     AND warpSkyfile.quality = 0
     AND magicDSFile.component IS NULL
+    AND (Label.active OR Label.active IS NULL)

tags/ipp-20100823/ippTools/share/pubtool_revert.sql

@@ -2 +2 @@
 USING publishDone, publishRun, publishClient
 WHERE publishDone.pub_id = publishRun.pub_id
+    AND publishRun.state = 'new'
     AND publishRun.client_id = publishClient.client_id
     AND publishClient.active = 1

tags/ipp-20100823/ippTools/src/magicdstool.c

@@ -637 +637 @@
     psFree(where);
 
+    psStringAppend(&query, "\nORDER BY priority DESC, magic_ds_id");
+
     // treat limit == 0 as "no limit"
     if (limit) {