OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-tools Date: 22-Sep-2005 13:42:33 Branch: HEAD Handle: 2005092212423300 Modified files: openpkg-tools/cmd bf-ui.pl Log: buildfarm matrix three (instead of two) state total row status for every package Summary: Revision Changes Path 1.16 +20 -10 openpkg-tools/cmd/bf-ui.pl ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-tools/cmd/bf-ui.pl ============================================================================ $ cvs diff -u -r1.15 -r1.16 bf-ui.pl --- openpkg-tools/cmd/bf-ui.pl 24 Mar 2005 11:21:11 -0000 1.15 +++ openpkg-tools/cmd/bf-ui.pl 22 Sep 2005 11:42:33 -0000 1.16 @@ -1168,8 +1168,8 @@ for my $i (@{$rv}) { $row->{$i->[0] . "-" . $i->[1] . "-" . $i->[2]} = $i->[3]; } - my ($goodrow, $lastsupport, $line); - $goodrow = 1; + my ($rowtotal, $lastsupport, $line); + $rowtotal = undef; $lastsupport = undef; $line = ""; foreach my $inst (@insts) { @@ -1187,28 +1187,38 @@ my $r = "</a>"; if ($color eq "green") { $line .= "$l<img src=\"$myurl?page=gif&name=icon-ok\" alt=\"green\" border=\"0\">$r"; + if (not defined $rowtotal or $rowtotal eq "green") { + $rowtotal = "green" if ($class eq "CORE" and $support >= 2 and $support <= 4); + $rowtotal = "green" if ($class eq "BASE" and $support == 3); + $rowtotal = "green" if ($class eq "PLUS" and $support == 3); + } } elsif ($color eq "red") { $line .= "$l<img src=\"$myurl?page=gif&name=icon-x\" alt=\"red\" border=\"0\">$r"; - $goodrow = 0 if ($class eq "CORE" and $support >= 2 and $support <= 4); - $goodrow = 0 if ($class eq "BASE" and $support == 3); - $goodrow = 0 if ($class eq "PLUS" and $support == 3); + $rowtotal = "red" if ($class eq "CORE" and $support >= 2 and $support <= 4); + $rowtotal = "red" if ($class eq "BASE" and $support == 3); + $rowtotal = "red" if ($class eq "PLUS" and $support == 3); } else { $line .= "$l<img src=\"$myurl?page=gif&name=icon-dot\" alt=\"$color\" border=\"0\">$r"; - $goodrow = 0 if ($class eq "CORE" and $support >= 2 and $support <= 4); - $goodrow = 0 if ($class eq "BASE" and $support == 3); - $goodrow = 0 if ($class eq "PLUS" and $support == 3); + if (not defined $rowtotal or $rowtotal eq "green" or $rowtotal eq "blue") { + $rowtotal = "blue" if ($class eq "CORE" and $support >= 2 and $support <= 4); + $rowtotal = "blue" if ($class eq "BASE" and $support == 3); + $rowtotal = "blue" if ($class eq "PLUS" and $support == 3); + } } } $line .= " <a href=\"$myurl?page=status&submit=status&vs_package=$package\">$package</a>\n"; $html .= "[<a href=\"$myurl?page=status&submit=status&vs_package=$package\">"; - if ($goodrow) { + if ($rowtotal eq "green") { $html .= "<img src=\"$myurl?page=gif&name=icon-ok\" alt=\"green\" border=\"0\">"; } - else { + elsif ($rowtotal eq "red") { $html .= "<img src=\"$myurl?page=gif&name=icon-x\" alt=\"red\" border=\"0\">"; } + else { + $html .= "<img src=\"$myurl?page=gif&name=icon-dot\" alt=\"blue\" border=\"0\">"; + } $html .= "</a>] "; $html .= $line; } @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org