Changeset 29359
- Timestamp:
- Oct 8, 2010, 11:18:48 AM (16 years ago)
- Location:
- tags/ipp-20100823/ippTools
- Files:
-
- 11 edited
-
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)
Legend:
- Unmodified
- Added
- Removed
-
tags/ipp-20100823/ippTools/share
- Property svn:mergeinfo set to
-
tags/ipp-20100823/ippTools/share/magicdstool_todestreak_camera.sql
r27945 r29359 19 19 recoveryroot, 20 20 re_place, 21 remove 21 remove, 22 IFNULL(Label.priority, 10000) AS priority 22 23 FROM magicDSRun 23 24 JOIN magicMask USING (magic_id) … … 29 30 LEFT JOIN magicDSFile 30 31 ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id 32 LEFT JOIN Label ON magicDSRun.label = Label.label 31 33 WHERE 32 34 magicDSRun.state = 'new' … … 38 40 AND camProcessedExp.quality = 0 39 41 AND magicDSFile.component IS NULL 42 AND (Label.active OR Label.active IS NULL) -
tags/ipp-20100823/ippTools/share/magicdstool_todestreak_chip.sql
r27945 r29359 19 19 recoveryroot, 20 20 re_place, 21 remove 21 remove, 22 IFNULL(Label.priority, 10000) AS priority 22 23 FROM magicDSRun 23 24 JOIN magicMask USING (magic_id) … … 31 32 ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id 32 33 AND magicDSFile.component = chipProcessedImfile.class_id 34 LEFT JOIN Label 35 ON magicDSRun.label = Label.label 33 36 WHERE 34 37 magicDSRun.state = 'new' … … 38 41 AND chipProcessedImfile.quality = 0 39 42 AND magicDSFile.component IS NULL 43 AND (Label.active OR Label.active IS NULL) -
tags/ipp-20100823/ippTools/share/magicdstool_todestreak_diff.sql
r27945 r29359 20 20 recoveryroot, 21 21 re_place, 22 remove 22 remove, 23 IFNULL(Label.priority, 10000) AS priority 23 24 FROM rawExp 24 25 JOIN magicRun USING (exp_id) … … 33 34 ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id 34 35 AND magicDSFile.component = diffSkyfile.skycell_id 36 LEFT JOIN Label ON magicDSRun.label = Label.label 35 37 WHERE 36 38 magicDSRun.state = 'new' … … 40 42 AND diffSkyfile.quality = 0 41 43 AND magicDSFile.component IS NULL 44 AND (Label.active OR Label.active IS NULL) 42 45 -- bothways diffSkyfiles 43 46 UNION … … 62 65 recoveryroot, 63 66 re_place, 64 remove 67 remove, 68 IFNULL(Label.priority, 10000) AS priority 65 69 FROM rawExp 66 70 JOIN magicRun USING (exp_id) … … 75 79 ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id 76 80 AND magicDSFile.component = diffSkyfile.skycell_id 81 LEFT JOIN Label ON magicDSRun.label = Label.label 77 82 WHERE 78 83 magicDSRun.state = 'new' … … 82 87 AND diffSkyfile.quality = 0 83 88 AND magicDSFile.component IS NULL 89 AND (Label.active OR Label.active IS NULL) 84 90 ) AS magicDSRun 85 91 -- we need the following so this query is compatible with the other stages -
tags/ipp-20100823/ippTools/share/magicdstool_todestreak_raw.sql
r27945 r29359 20 20 recoveryroot, 21 21 re_place, 22 remove 22 remove, 23 10000 AS priority 23 24 FROM magicDSRun 24 25 JOIN magicMask USING (magic_id) -
tags/ipp-20100823/ippTools/share/magicdstool_todestreak_warp.sql
r27945 r29359 19 19 recoveryroot, 20 20 re_place, 21 remove 21 remove, 22 IFNULL(Label.priority, 10000) AS priority 22 23 FROM magicDSRun 23 24 JOIN magicMask USING (magic_id) … … 29 30 ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id 30 31 AND magicDSFile.component = warpSkyfile.skycell_id 32 LEFT JOIN Label ON magicDSRun.label = Label.label 31 33 WHERE 32 34 magicDSRun.state = 'new' … … 36 38 AND warpSkyfile.quality = 0 37 39 AND magicDSFile.component IS NULL 40 AND (Label.active OR Label.active IS NULL) -
tags/ipp-20100823/ippTools/share/pubtool_pending.sql
- Property svn:mergeinfo changed (with no actual effect on merging)
-
tags/ipp-20100823/ippTools/share/pubtool_revert.sql
r25929 r29359 2 2 USING publishDone, publishRun, publishClient 3 3 WHERE publishDone.pub_id = publishRun.pub_id 4 AND publishRun.state = 'new' 4 5 AND publishRun.client_id = publishClient.client_id 5 6 AND publishClient.active = 1 -
tags/ipp-20100823/ippTools/share/pxadmin_create_tables.sql
- Property svn:mergeinfo deleted
-
tags/ipp-20100823/ippTools/share/warptool_scmap.sql
- Property svn:mergeinfo changed (with no actual effect on merging)
-
tags/ipp-20100823/ippTools/src/magicdstool.c
- Property svn:mergeinfo set to
r29138 r29359 637 637 psFree(where); 638 638 639 psStringAppend(&query, "\nORDER BY priority DESC, magic_ds_id"); 640 639 641 // treat limit == 0 as "no limit" 640 642 if (limit) {
Note:
See TracChangeset
for help on using the changeset viewer.
