Changeset 27861

Timestamp:

May 5, 2010, 11:59:12 AM (16 years ago)

Author:

rhenders

Message:

Simplified counts on diff stage

File:

• trunk/tools/czartool.pl (modified) (4 diffs)

trunk/tools/czartool.pl

@@ -118 +118 @@
 
     my $item;
-    foreach $item (@array1, @array2) { $count{$item}++;}
+    foreach $item (@array1, @array2) {$count{$item}++;}
 
     foreach $item (keys %count) {
@@ -350 +350 @@
     elsif ($stage eq "magic") {$joinTable="magicNodeResult";}
     elsif ($stage eq "magicDS") {$id = "magic_ds_id"; $joinTable="magicDSFile";}
-    elsif ($stage eq "dist") {return countDistFaults($label);}
+    elsif ($stage eq "dist") {$joinTable="distComponent";}
     else {return -1;}
 
     my $faultCol =  $joinTable.".fault";
+    my $stateCol =  $table.".state";
 
     my $query = $db->prepare(<<SQL);
@@ -361 +362 @@
         WHERE label LIKE '$label'
         AND $faultCol != 0
-        AND state = 'new'
+        AND $stateCol = 'new'
 
 SQL
@@ -369 +370 @@
 }
 
-###########################################################################
-#
-# Counts total distribution faults
-#
-###########################################################################
-sub countDistFaults {
-    my ($label) = @_;
-
-    my $query = $db->prepare(<<SQL);
-    SELECT COUNT(*) 
-        FROM distRun 
-        JOIN distComponent USING(dist_id) 
-        WHERE label LIKE '$label' 
-        AND distComponent.fault > 0
-        AND distRun.state = 'new'
-
-SQL
-
-        $query->execute;
-    my $count = $query->fetchrow_array();
-
-    $query = $db->prepare(<<SQL);
-    SELECT COUNT(*) 
-        FROM distRun 
-        WHERE label LIKE '$label' 
-        AND fault > 0
-        AND distRun.state = 'new'
-
-SQL
-
-        $query->execute;
-
-    return $count + $query->fetchrow_array();
-}
-