Changeset 28162

Timestamp:

May 28, 2010, 1:45:41 PM (16 years ago)

Author:

rhenders

Message:

Improved formatting for single label display

File:

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

trunk/tools/czartool.pl

@@ -11 +11 @@
 use File::Temp qw(tempfile);
 
-my @states = ("full", "new", "drop", "wait", "fault");
+my @states = ("full", "new", "drop", "wait");
 my $db = connectToDb();
 
@@ -190 +190 @@
         chomp($label);
         printf("| %10s ", $state);
-        printf("| %5d ", checkLabel($label, "chipRun", $state, "chip"));
-        printf("| %5d ", checkLabel($label, "camRun", $state, "cam"));
-        printf("| %5d ", checkLabel($label, "fakeRun", $state, "fake"));
-        printf("| %5d ", checkLabel($label, "warpRun", $state, "warp"));
-        printf("| %5d ", checkLabel($label, "stackRun", $state, "stack"));
-        printf("| %5d ", checkLabel($label, "diffRun", $state, "diff"));
-        printf("| %5d ", checkLabel($label, "magicRun", $state, "magic"));
-        printf("| %6d ", checkLabel($label, "magicDSRun", $state, "magicDS"));
-        printf("| %5d ", checkLabel($label, "distRun", $state, "dist"));
+        printf("| %5s ", getStateAndFaults($label, "chipRun", $state, "chip"));
+        printf("| %5s ", getStateAndFaults($label, "camRun", $state, "cam"));
+        printf("| %5s ", getStateAndFaults($label, "fakeRun", $state, "fake"));
+        printf("| %5s ", getStateAndFaults($label, "warpRun", $state, "warp"));
+        printf("| %5s ", getStateAndFaults($label, "stackRun", $state, "stack"));
+        printf("| %5s ", getStateAndFaults($label, "diffRun", $state, "diff"));
+        printf("| %5s ", getStateAndFaults($label, "magicRun", $state, "magic"));
+        printf("| %6s ", getStateAndFaults($label, "magicDSRun", $state, "magicDS"));
+        printf("| %5s ", getStateAndFaults($label, "distRun", $state, "dist"));
         printf("|\n");
         $i++;