Changeset 30579 for branches/eam_branches/ipp-20101205/ippTools/share

Timestamp:

Feb 11, 2011, 2:49:34 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20101205/ippTools/share

Files:

• camtool_find_pendingimfile.sql (modified) (1 prop)
• chiptool_processedimfile.sql (modified) (2 diffs)
• difftool_pendingcleanupskyfile.sql (modified) (1 diff)
• difftool_setskyfiletoupdate.sql (modified) (1 diff)
• magicdstool_setfiletoupdate.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (1 prop)
• regtool_pendingexp.sql (modified) (1 diff)
• warptool_change_skyfile_data_state.sql (modified) (1 diff)
• warptool_scmap.sql (modified) (1 diff)
• warptool_setskyfiletoupdate.sql (modified) (1 diff)
• warptool_towarped.sql (modified) (3 diffs)

branches/eam_branches/ipp-20101205/ippTools/share/chiptool_processedimfile.sql

@@ -29 +29 @@
     rawImfile.magicked AS raw_magicked,
     rawImfile.burntool_state,
+    IFNULL(magicDSRun.magic_ds_id, 0) AS magic_ds_id,
     magicDSRun.state AS dsRun_state,
-    IFNULL(magicDSRun.magic_ds_id, 0) AS magic_ds_id
+    magicDSFile.data_state AS dsFile_data_state
 FROM chipRun
 JOIN chipImfile
@@ -43 +44 @@
 LEFT JOIN magicDSRun
     ON stage_id = chip_id AND stage = 'chip' AND magicDSRun.re_place AND magicDSRun.state != 'drop'
+LEFT JOIN magicDSFile ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id AND chipProcessedImfile.class_id = magicDSFile.component

branches/eam_branches/ipp-20101205/ippTools/share/difftool_pendingcleanupskyfile.sql

@@ -9 +9 @@
     USING(diff_id)
 WHERE
-   ((diffRun.state = 'goto_cleaned'  AND diffSkyfile.data_state = 'full')
+   ((diffRun.state = 'goto_cleaned'  AND (diffSkyfile.data_state = 'full' OR diffSkyfile.data_state = 'update'))
     OR
     (diffRun.state = 'goto_scrubbed' AND diffSkyfile.data_state != 'scrubbed')

branches/eam_branches/ipp-20101205/ippTools/share/difftool_setskyfiletoupdate.sql

@@ -1 +1 @@
 UPDATE diffRun
     JOIN diffSkyfile USING(diff_id)
-    LEFT JOIN magicDSRun ON (stage_id = diff_id AND stage = 'diff')
-    LEFT JOIN magicDSFile ON (magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
-                              AND component = skycell_id)
 SET diffRun.state = 'update', 
-    diffSkyfile.data_state = 'update'
+    diffSkyfile.data_state = 'update',
+    diffSkyfile.fault = 0
     -- set hook %s
 WHERE diff_id = %lld
     AND (diffRun.state = 'cleaned' OR diffRun.state = 'update')
-    AND (diffSkyfile.data_state = 'cleaned')
+    AND (diffSkyfile.data_state = 'cleaned' OR diffSkyfile.data_state = 'update')

branches/eam_branches/ipp-20101205/ippTools/share/magicdstool_setfiletoupdate.sql

@@ -7 +7 @@
 WHERE magic_ds_id = %lld
     AND (magicDSRun.state = 'cleaned' OR magicDSRun.state = 'update')
-    AND (magicDSFile.data_state = 'cleaned')
+    AND (magicDSFile.data_state = 'cleaned' OR magicDSFile.data_state ='update')

branches/eam_branches/ipp-20101205/ippTools/share/regtool_pendingexp.sql

@@ -48 +48 @@
           GROUP BY newExp.exp_id
           HAVING SUM(rawImfile.fault) = 0
+          LIMIT 256
          ) AS RAWEXPOSURES
          USING (exp_id)

branches/eam_branches/ipp-20101205/ippTools/share/warptool_change_skyfile_data_state.sql

@@ -1 +1 @@
 -- handle changes in warpSkyfile.data_state.
 -- Used for the modes tofullskyfile, tocleanedskyfile and topurgedskyfile
--- args are new data_state, string for magic hook, warp_id, skycell_id and current expected state for warpRun
+-- arguments are are new data_state, string for magic hook, warp_id, skycell_id
 UPDATE warpSkyfile
 JOIN warpRun USING(warp_id)

branches/eam_branches/ipp-20101205/ippTools/share/warptool_scmap.sql

@@ -12 +12 @@
     IFNULL(magicDSRun.magic_ds_id, 0) AS magic_ds_id,
     IFNULL(magicDSRun.state, 0) AS dsRun_state,
+    IFNULL(magicDSFile.data_state, 0) AS dsFile_data_state,
     IFNULL(magicDSFile.fault, 0) as dsFile_fault
 FROM warpRun

branches/eam_branches/ipp-20101205/ippTools/share/warptool_setskyfiletoupdate.sql

@@ -1 +1 @@
 UPDATE warpRun
     JOIN warpSkyfile USING(warp_id)
-    LEFT JOIN magicDSRun ON (stage_id = warp_id AND stage = 'warp')
-    LEFT JOIN magicDSFile ON (magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
-                              AND component = skycell_id)
 SET warpRun.state = 'update', 
-    warpSkyfile.data_state = 'update'
+    warpSkyfile.data_state = 'update',
+    warpSkyfile.fault = 0
     -- set hook %s
 WHERE warp_id = %lld
     AND (warpRun.state = 'cleaned' OR warpRun.state = 'update')
-    AND (warpSkyfile.data_state = 'cleaned')
+    AND (warpSkyfile.data_state = 'cleaned' OR warpSkyfile.data_state = 'update')

branches/eam_branches/ipp-20101205/ippTools/share/warptool_towarped.sql

@@ -11 +11 @@
     exp_tag,
     workdir,
+    label,
     magicked,
     path_base,
@@ -23 +24 @@
         warpRun.state,
         warpRun.reduction,
+        warpRun.label,
         camRun.cam_id,
         rawExp.camera,
@@ -76 +78 @@
         warpRun.state,
         warpRun.reduction,
+        warpRun.label,
         camRun.cam_id,
         rawExp.camera,