show vpath builds in icon set

[buildfarm-server.git] / cgi-bin / show_status.pl
diff --git a/cgi-bin/show_status.pl b/cgi-bin/show_status.pl

index d41dff1da3973f9a52cc3f17ed61dc6abd76d699..8c962f5d3a31a0ab4dc10bceeddf9024e885daa6 100755 (executable)
--- a/cgi-bin/show_status.pl
+++ b/cgi-bin/show_status.pl
@@ -39,8 +39,8 @@ my $db = DBI->connect($dsn,$dbuser,$dbpass) or die("$dsn,$dbuser,$dbpass,$!");
  my $statement =<<EOS;
  
  
-  select *
-  from dashboard
+  select timezone('GMT'::text, now())::timestamp(0) without time zone - b.snapshot AS when_ago, b.*
+  from dashboard_mat b
    order by branch = 'HEAD' desc,
          branch desc, $sort_clause 
          snapshot desc
@@ -59,9 +59,15 @@ while (my $row = $sth->fetchrow_hashref)
         # enable-integer-datetimes is now the default
         if ($row->{branch} eq 'HEAD' || $row->{branch} gt 'REL8_3_STABLE')
         {
-               $row->{buildflags} .- " --enable-integer-datetimes "
+               $row->{build_flags} .= " --enable-integer-datetimes "
                         unless ($row->{build_flags} =~ /--(en|dis)able-integer-datetimes/);
         }
+       # enable-thread-safety is now the default
+       if ($row->{branch} eq 'HEAD' || $row->{branch} gt 'REL8_5_STABLE')
+       {
+               $row->{build_flags} .= " --enable-thread-safety "
+                       unless ($row->{build_flags} =~ /--(en|dis)able-thread-safety/);
+       }
      $row->{build_flags}  =~ s/--((enable|with)-)?//g;
         $row->{build_flags} =~ s/libxml/xml/;
      $row->{build_flags}  =~ s/\S+=\S+//g;
@@ -100,6 +106,7 @@ __DATA__
       nls => '/img/translateicon.gif',
       krb5 => '/img/krb.gif',
       tcl => '/img/tcl.png',
+     vpath => '/img/vpath.png',
       xml => '/img/xml.png',
       'thread-safety' => '/img/threads.gif',
       'integer-datetimes' = '/img/days.png',
@@ -108,7 +115,7 @@ __DATA__
  [%- BLOCK img ; IF flag == 'depend' or flag == 'gnu-ld' ; ; ELSIF flag_imgs.$flag %]<img src="[% flag_imgs.$flag %]" title="[% flag %]" alt="[% flag %]" height="16" width="16" class="inline" align="bottom" />  [% ELSE %][%#
                                                                                                                                                                                                           flag ; ' '
  %][% END ; END -%]
-[%- BLOCK cl %] class=" [% SWITCH bgfor -%]
+[%- BLOCK cl %] class="[% SWITCH bgfor.replace('-.*','') -%]
    [%- CASE 'OK' %]pass[% CASE 'ContribCheck' %]warn[% CASE [ 'Check' 'InstallCheck' ] %]warnx[% CASE %]fail[% END %]"
  [%- END -%]
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"