Changeset 27633

Timestamp:

Apr 7, 2010, 1:31:42 PM (16 years ago)

Author:

Paul Price

Message:

Select on state too.

File:

• trunk/tools/errors.pl (modified) (1 diff)

trunk/tools/errors.pl

@@ -53 +53 @@
     $fault_table = "diffSkyfile";
 } elsif ($stage eq "stack") {
-    $sql = "SELECT stack_id, 'stack', hostname, path_base FROM stackRun JOIN stackSumSkyfile USING(stack_id) WHERE fault != 0";
+    $sql = "SELECT stack_id, 'stack', hostname, path_base FROM stackRun JOIN stackSumSkyfile USING(stack_id) WHERE fault != 0 AND state = 'new'";
     $label_table = "stackRun";
     $fault_table = "stackSumSkyfile";
 } elsif ($stage eq "warp") {
-    $sql = "SELECT warp_id, skycell_id, hostname, path_base FROM warpRun JOIN warpSkyfile USING(warp_id) WHERE fault != 0";
+    $sql = "SELECT warp_id, skycell_id, hostname, path_base FROM warpRun JOIN warpSkyfile USING(warp_id) WHERE fault != 0 AND state = 'new'";
     $label_table = "warpRun";
     $fault_table = "warpSkyfile";
 } elsif ($stage eq "magic") {
-    $sql = "SELECT magic_id, node, 'unknown' AS hostname, CONCAT(workdir, '/', exp_id, '/', exp_id, '.mgc.', magic_id, '.', node) FROM magicRun JOIN magicNodeResult USING(magic_id) WHERE magicNodeResult.fault != 0";
+    $sql = "SELECT magic_id, node, 'unknown' AS hostname, CONCAT(workdir, '/', exp_id, '/', exp_id, '.mgc.', magic_id, '.', node) FROM magicRun JOIN magicNodeResult USING(magic_id) WHERE magicNodeResult.fault != 0 AND state = 'new'";
     $label_table = "magicRun";
     $fault_table = "magicNodeResult";
 } elsif ($stage eq "chip") {
-    $sql = "SELECT chip_id, class_id, hostname, CONCAT(path_base, '.', class_id) FROM chipRun JOIN chipProcessedImfile USING(chip_id) WHERE fault != 0";
+    $sql = "SELECT chip_id, class_id, hostname, CONCAT(path_base, '.', class_id) FROM chipRun JOIN chipProcessedImfile USING(chip_id) WHERE fault != 0 AND state = 'new'";
     $label_table = "chipRun";
     $fault_table = "chipProcessedImfile";
 } elsif ($stage eq "camera") {
-    $sql = "SELECT cam_id, 'cam', hostname, path_base FROM camRun JOIN camProcessedExp USING(cam_id) WHERE fault != 0";
+    $sql = "SELECT cam_id, 'cam', hostname, path_base FROM camRun JOIN camProcessedExp USING(cam_id) WHERE fault != 0 AND state = 'new'";
     $label_table = "camRun";
     $fault_table = "camProcessedExp";
 } elsif ($stage eq "destreak") {
-    $sql = "SELECT magic_ds_id, component, 'unknown', CONCAT_WS('.', CONCAT(outroot, '/', exp_id), 'mds', magic_ds_id, stage_id, component) FROM magicDSRun JOIN magicDSFile USING(magic_ds_id) JOIN magicRun USING(magic_id) WHERE magicDSFile.fault != 0";
+    $sql = "SELECT magic_ds_id, component, 'unknown', CONCAT_WS('.', CONCAT(outroot, '/', exp_id), 'mds', magic_ds_id, stage_id, component) FROM magicDSRun JOIN magicDSFile USING(magic_ds_id) JOIN magicRun USING(magic_id) WHERE magicDSFile.fault != 0 AND magicDSRun.state = 'new'";
     $label_table = "magicDSRun";
     $fault_table = "magicDSFile";