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:   27-Sep-2005 14:40:17
  Branch: HEAD                             Handle: 2005092713401600

  Modified files:
    openpkg-tools/cmd       bf-ui.pl

  Log:
    introduce printsum function

  Summary:
    Revision    Changes     Path
    1.19        +55 -5      openpkg-tools/cmd/bf-ui.pl
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-tools/cmd/bf-ui.pl
  ============================================================================
  $ cvs diff -u -r1.18 -r1.19 bf-ui.pl
  --- openpkg-tools/cmd/bf-ui.pl        27 Sep 2005 12:39:15 -0000      1.18
  +++ openpkg-tools/cmd/bf-ui.pl        27 Sep 2005 12:40:16 -0000      1.19
  @@ -232,7 +232,23 @@
       $out .= "<hr>";
       print STDOUT $out;
       $out = '';
  -    &printlog($cgi->param("file"), $cgi->param("mode"));
  +    &printlog($cgi->param("file"));
  +    $out .= &viewhtmltail();
  +    print STDOUT $out;
  +}
  +elsif ($cgi->param("page") eq "sum") {
  +    my $out;
  +    $out = '';
  +    $out .= &viewhttp();
  +    $out .= &viewhtmlhead();
  +    $out .= &viewmainform();
  +    $out .= &viewprocessingform();
  +    $out .= &viewstatusform();
  +    $out .= &viewmatrixform();
  +    $out .= "<hr>";
  +    print STDOUT $out;
  +    $out = '';
  +    &printsum($cgi->param("inst"), $cgi->param("package"));
       $out .= &viewhtmltail();
       print STDOUT $out;
   }
  @@ -899,7 +915,7 @@
   
   sub printlog()
   {
  -    my ($relfile, $mode) = @_;
  +    my ($relfile) = @_;
   
       my $html;
   
  @@ -926,6 +942,40 @@
       print STDOUT $html;
   }
   
  +sub printsum()
  +{
  +    my ($inst, $package) = @_;
  +    my ($host, $arch, $os, $tag) = &splitinst($inst);
  +    my ($name, $version, $release) = &splitpackage($package);
  +    my $relfile = "$host-$arch-$os/$package.log.$host.$arch-$os-$tag";
  +
  +    my $html;
  +
  +    $html .= "<h2>$inst</h2>";
  +    $html .= "<h2>$package</h2>";
  +
  +    $html .= "<table class=\"bf\">\n";
  +    $html .= "<tr>";
  +
  +    # inst (host-arch-os)
  +    $html .= "<td><a 
href=\"$myurl?page=status&submit=status&vs_inst=$inst\">$inst</a>" . 
"&nbsp;</td>";
  +
  +    # package (name-version-release)
  +    $html .= "<td><a 
href=\"$myurl?page=status&submit=status&vs_package=$package\">$package</a></td>";
  +
  +    # cvs
  +    $html .= "<td><a 
href=\"http://cvs.openpkg.org/rlog?f=openpkg-src/$name/$name.spec\";>timeline</a></td>";
  +    $html .= "<td><a 
href=\"http://cvs.openpkg.org/getfile/openpkg-src/$name/$name.spec\";>specfile</a></td>";
  +    $html .= "<td><a 
href=\"http://cvs.openpkg.org/dir?d=openpkg-src/$name\";>browse</a></td>";
  +
  +    $html .= "</tr>\n";
  +    $html .= "</table>";
  +    $html .= "<hr>";
  +    print STDOUT $html;
  +
  +    &printlog($relfile);
  +}
  +
   sub viewprocessing()
   {
       my $rv;
  @@ -961,7 +1011,7 @@
                $r = "</td>";
            }
            else {
  -             $l = "<td><a href=\"$myurl?page=log&mode=tail&file=$logfile\">";
  +             $l = "<td><a 
href=\"$myurl?page=sum&inst=$inst-openpkg&package=$package\">";
                $r = "</a></td>";
            }
            $html .= "$l<img src=\"$myurl?page=gif&name=icon-dia\" alt=\"dia\" 
border=\"0\">$r";
  @@ -1186,7 +1236,7 @@
   
                       # color
                       my $color = $row->{$inst};
  -                    my $l = "<a 
href=\"$myurl?page=log&mode=tail&file=$logfile\">";
  +                    my $l = "<a 
href=\"$myurl?page=sum&inst=$inst-openpkg&package=$package\">";
                       my $r = "</a>";
                       if ($color eq "green") {
                           $line .= "$l<img 
src=\"$myurl?page=gif&name=icon-ok\" alt=\"green\" border=\"0\">$r";
  @@ -1340,7 +1390,7 @@
   
            # color
            my $color = %{$i}->{st_build_color};
  -         my $l = "<td><a href=\"$myurl?page=log&mode=tail&file=$logfile\">";
  +         my $l = "<td><a 
href=\"$myurl?page=sum&inst=$inst-openpkg&package=$package\">";
            my $r = "</a></td>";
            if ($color eq "green") {
                $html .= "$l<img src=\"$myurl?page=gif&name=icon-ok\" 
alt=\"green\" border=\"0\">$r";
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to