Changeset 30812 for branches/eam_branches/ipp-20110213/ippTools/share

Timestamp:

Mar 6, 2011, 2:34:55 PM (15 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/ipp-20110213/ippTools/share

Files:

• camtool_find_pendingimfile.sql (modified) (1 prop)
• magicdstool_todestreak_raw.sql (modified) (2 diffs)
• magicdstool_torevert_diff.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (1 prop)

branches/eam_branches/ipp-20110213/ippTools/share/magicdstool_todestreak_raw.sql

@@ -24 +24 @@
     re_place,
     remove,
-    10000 AS priority
+    IFNULL(Label.priority, 10000) AS priority
 FROM magicDSRun
 JOIN magicMask USING (magic_id)
@@ -35 +35 @@
     ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
     AND magicDSFile.component = rawImfile.class_id
+LEFT JOIN Label ON magicDSRun.label = Label.label
 WHERE
     magicDSRun.state = 'new'
     AND magicDSRun.stage = 'raw'
     AND magicDSFile.component IS NULL
+    AND (Label.active OR Label.active IS NULL)
+

branches/eam_branches/ipp-20110213/ippTools/share/magicdstool_torevert_diff.sql

@@ -13 +13 @@
     magicDSFile.recovery_path_base,
     "NULL" AS cam_path_base,
-    recovery_path_base,
     CAST(diffRun.bothways AS SIGNED) AS bothways,
     0 AS bytes,