Changeset 27912

Timestamp:

May 11, 2010, 8:43:33 AM (16 years ago)

Author:

rhenders

Message:

More meaningful numbers for faults; fixed bug when listing labels for non-stdscience servers

File:

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

trunk/tools/czartool.pl

@@ -146 +146 @@
 
         chomp($line);
-        if ($line =~ m/pantasks:/) {$passedHeader=1; next;}
-
+        if ($line =~ m/pantasks:\s+(.*)/) {
+           
+            # HACK to get around 'dummy' label in stdscience
+            if ($1 !~ m/.*dummy.*/) {push(@labels, $!);}
+            $passedHeader=1; 
+            next;
+        }
+        
         if ($passedHeader){push(@labels, $line);}
     }
@@ -355 +361 @@
 
     my $query = $db->prepare(<<SQL);
-    SELECT COUNT(*) 
+    SELECT COUNT(DISTINCT $id) 
         FROM $table
         JOIN $joinTable USING ($id)