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: 10-Oct-2005 23:07:19 Branch: HEAD Handle: 2005101022071800 Modified files: openpkg-tools/cmd bf-ui.pl Log: overlay color for currently processed packages in matrix Summary: Revision Changes Path 1.22 +24 -3 openpkg-tools/cmd/bf-ui.pl ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-tools/cmd/bf-ui.pl ============================================================================ $ cvs diff -u -r1.21 -r1.22 bf-ui.pl --- openpkg-tools/cmd/bf-ui.pl 10 Oct 2005 21:06:08 -0000 1.21 +++ openpkg-tools/cmd/bf-ui.pl 10 Oct 2005 21:07:18 -0000 1.22 @@ -1099,6 +1099,19 @@ { my $html; my ($sth, $sthpackages, $rv); + my $processing = {}; + + $rv = $dbh->selectall_hashref("SELECT * FROM processing;", "pr_inst_host"); + if (not $rv) { + die "ERROR:$0: SQLite error: ".$dbh->errstr."\n"; + } + for my $i (sort keys %{$rv}) { + my ($name, $version, $release) = (%{$rv}->{$i}->{pr_package_name}, %{$rv}->{$i}->{pr_package_version}, %{$rv}->{$i}->{pr_package_release}); + my ($host, $arch, $os, $tag) = (%{$rv}->{$i}->{pr_inst_host}, %{$rv}->{$i}->{pr_inst_arch}, %{$rv}->{$i}->{pr_inst_os}, %{$rv}->{$i}->{pr_inst_tag}); + my $inst = $host . "-" . $arch . "-" . $os; + my $package = $name . "-" . $version . "-" . $release; + $processing->{$inst} = $package; + } my @classes; $rv = $dbh->selectall_arrayref("SELECT DISTINCT cl_package_class " . @@ -1246,9 +1259,10 @@ # color my $color = $row->{$inst}; my $l = "<a href=\"$myurl?page=sum&inst=$inst-openpkg&package=$package\">"; + my $m = ""; my $r = "</a>"; if ($color eq "green") { - $line .= "$l<img src=\"$myurl?page=gif&name=icon-ok\" class=\"green\" alt=\"green\" border=\"0\">$r"; + $m = "<img src=\"$myurl?page=gif&name=icon-ok\" class=\"green\" alt=\"green\" border=\"0\">"; 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); @@ -1258,7 +1272,7 @@ } } elsif ($color eq "red") { - $line .= "$l<img src=\"$myurl?page=gif&name=icon-x\" class=\"red\" alt=\"red\" border=\"0\">$r"; + $m = "<img src=\"$myurl?page=gif&name=icon-x\" class=\"red\" alt=\"red\" border=\"0\">"; $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); @@ -1266,7 +1280,7 @@ $rowtotal = "red" if ($class eq "JUNK"); } else { - $line .= "$l<img src=\"$myurl?page=gif&name=icon-dot\" class=\"$color\" alt=\"$color\" border=\"0\">$r"; + $m = "<img src=\"$myurl?page=gif&name=icon-dot\" class=\"$color\" alt=\"$color\" border=\"0\">"; 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); @@ -1275,6 +1289,13 @@ $rowtotal = "blue" if ($class eq "JUNK"); } } + + # overlay color for currently processed packages + if ($processing->{$inst} eq $package) { + $m = "<img src=\"$myurl?page=gif&name=icon-dia\" class=\"dia\" alt=\"dia\" border=\"0\">"; + } + + $line .= $l . $m . $r; } $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\">"; @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org