Better fix.
authorFrantišek Dvořák <valtri@civ.zcu.cz>
Sun, 11 Mar 2012 19:20:43 +0000 (20:20 +0100)
committerFrantišek Dvořák <valtri@civ.zcu.cz>
Sun, 11 Mar 2012 19:20:43 +0000 (20:20 +0100)
dashboard.pl

index 5270d3b..ff18e87 100755 (executable)
@@ -73,8 +73,8 @@ foreach my $s (keys %list) {
                                        $result=`grep -- '-TEST FAILED-' $item->{dir}/report.twiki 2>/dev/null| wc -l | sed 's/ *//g'`;
                                        chomp $result;
                                } else {
-                                       if ($section == 0) { $result = '<B>Error</B>'; }
-                                       else { $result = '<B>Failed</B>'; }
+                                       if ($section == 0) { $result = 'Error'; }
+                                       else { $result = 'Failed'; }
                                }
                        } else { undef $result; }
                        $item->{result} = defined $result ? $result : '-';
@@ -209,8 +209,9 @@ print qq(<?xml version="1.0" encoding="UTF-8"?>
                                if ($item->{result} eq '0') { $class='OK'; }
                                else { $class='FAIL'; }
 
-                               if ( $item->{result} == "0" ) { $result="<B>$item->{result} error</B>"; }
-                               else { $result="<B>$item->{result} errors</B>"; }
+                               if ( $item->{result} eq '1' ) { $result="<b>$item->{result} error</b>"; }
+                               elsif ($item->{result} =~ /^[0-9]+$/) { $result="<b>$item->{result} errors</b>"; }
+                               else { $result = "<b>$item->{result}</b>"; }
 
                                print "         <td class=\"$class\"><span class=\"date\">$item->{date}</span><br/><a href=\"$item->{dir}/\">$result</a></td>\n";
                        } else {
@@ -219,9 +220,13 @@ print qq(<?xml version="1.0" encoding="UTF-8"?>
 
                        $item = $list{upgrade}{$c}{$p};
                        if (defined $item) {
-                               $result = $item->{result};
                                if ($item->{result} eq '0') { $class='OK'; }
                                else { $class='FAIL'; }
+
+                               if ( $item->{result} eq '1' ) { $result="<b>$item->{result} error</b>"; }
+                               elsif ($item->{result} =~ /^[0-9]+$/) { $result="<b>$item->{result} errors</b>"; }
+                               else { $result = "<b>$item->{result}</b>"; }
+
                                print "         <td class=\"$class\"><span class=\"date\">$item->{date}</span><br/><a href=\"$item->{dir}/\">$result</a></td>\n";
                        } else {
                                print "         <td class=\"NA\"></td>\n"