Changeset 33247

Timestamp:

Feb 13, 2012, 1:44:07 PM (14 years ago)

Author:

bills

Message:

commit some changes to cleanup that have been running for awhile in the tag

Location:

tags/ipp-20111222

Files:

• ippScripts/scripts/ipp_cleanup.pl (modified) (2 diffs, 1 prop)
• ippTools/share/chiptool_change_exp_state.sql (modified) (1 diff, 1 prop)
• ippTools/share/chiptool_pendingcleanupimfile.sql (modified) (1 diff, 1 prop)
• ippTools/share/difftool_change_run_state.sql (modified) (1 diff, 1 prop)
• ippTools/share/difftool_pendingcleanupskyfile.sql (modified) (1 diff, 1 prop)
• ippTools/share/warptool_change_run_state.sql (modified) (1 diff, 1 prop)
• ippTools/share/warptool_pendingcleanupskyfile.sql (modified) (1 diff, 1 prop)

tags/ipp-20111222/ippScripts/scripts/ipp_cleanup.pl

@@ -218 +218 @@
             $command .= " -dbname $dbname" if defined $dbname;
 
+if (0) {
+        # XXX Don't set components to error cleaned anymore
             my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
                     run(command => $command, verbose => $verbose);
@@ -224 +226 @@
                 &my_die("Unable to perform chiptool: $error_code", "chip", $stage_id, $error_code);
             }
+}
 
             # We want to flag the run as well, to avoid attempting to reprocess the same data over and over again.

tags/ipp-20111222/ippTools/share/chiptool_change_exp_state.sql

@@ -14 +14 @@
         WHERE
             chipProcessedImfile.chip_id = chipRun.chip_id
+            AND chipProcessedImfile.quality = 0
             AND data_state != '%s'
         ) = 0

tags/ipp-20111222/ippTools/share/chiptool_pendingcleanupimfile.sql

@@ -14 +14 @@
 WHERE
     ((chipRun.state = 'goto_cleaned' AND (chipProcessedImfile.data_state = 'full'
-                                       OR chipProcessedImfile.data_state = 'update'))
+                                       OR chipProcessedImfile.data_state = 'update') AND chipProcessedImfile.quality = 0)
 OR 
     (chipRun.state = 'goto_scrubbed' AND chipProcessedImfile.data_state != 'scrubbed')

tags/ipp-20111222/ippTools/share/difftool_change_run_state.sql

@@ -14 +14 @@
             diffSkyfile.diff_id = diffRun.diff_id
             AND data_state != '%s'
+            AND diffSkyfile.quality = 0
         ) = 0

tags/ipp-20111222/ippTools/share/difftool_pendingcleanupskyfile.sql

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

tags/ipp-20111222/ippTools/share/warptool_change_run_state.sql

@@ -17 +17 @@
             warpSkyfile.warp_id = warpRun.warp_id
             AND warpSkyfile.data_state != '%s'
+            AND warpSkyfile.quality = 0
         ) = 0

tags/ipp-20111222/ippTools/share/warptool_pendingcleanupskyfile.sql

@@ -11 +11 @@
 WHERE
    ((warpRun.state = 'goto_cleaned'  AND (warpSkyfile.data_state = 'full'
-                                      OR  warpSkyfile.data_state = 'update'))
+                                      OR  warpSkyfile.data_state = 'update')
+    AND warpSkyfile.quality = 0)
     OR
     (warpRun.state = 'goto_scrubbed' AND warpSkyfile.data_state != 'scrubbed')