Another instance of virtual bug that would strip plus from branch names.

[buildfarm-server.git] / cgi-bin / show_failures.pl

diff --git a/cgi-bin/show_failures.pl b/cgi-bin/show_failures.pl
index 15b0be5e3c628e7288080f2ba36895487df2b766..5b14cccf367087df08e803fba3fde199dbd44791 100755 (executable)
--- a/cgi-bin/show_failures.pl
+++ b/cgi-bin/show_failures.pl
@@ -15,13 +15,17 @@ use CGI;
 
 use vars qw($dbhost $dbname $dbuser $dbpass $dbport $template_dir);
 
-
-require "$ENV{BFConfDir}/BuildFarmWeb.pl";
+use FindBin qw($RealBin);
+require "$RealBin/../BuildFarmWeb.pl";
 
 my $query = new CGI;
-my @members = $query->param('member');
+my @members = grep {$_ ne "" } $query->multi_param('member');
 map { s/[^a-zA-Z0-9_ -]//g; } @members;
 my $max_days =  $query->param('max_days') + 0 || 10;
+my @branches = grep {$_ ne "" } $query->multi_param('branch');
+map { s/[^a-zA-Z0-9+_ .-]//g; } @branches;
+my @stages = grep {$_ ne "" } $query->multi_param('stage');
+map { s/[^a-zA-Z0-9_ :-]//g; } @stages;
 
 my $dsn="dbi:Pg:dbname=$dbname";
 $dsn .= ";host=$dbhost" if $dbhost;
@@ -43,6 +47,38 @@ elsif ($sortby eq 'namenobranch')
 my $db = DBI->connect($dsn,$dbuser,$dbpass,{pg_expand_array => 0}) 
     or die("$dsn,$dbuser,$dbpass,$!");
 
+my $get_all_branches = qq{
+
+  select distinct branch
+  from nrecent_failures
+  where branch <> 'HEAD'
+  order by branch desc
+
+};
+
+my $all_branches = $db->selectcol_arrayref($get_all_branches);
+unshift (@$all_branches,'HEAD');
+
+my $get_all_members = qq{
+
+  select distinct sysname
+  from nrecent_failures
+  order by sysname
+
+};
+
+my $all_members = $db->selectcol_arrayref($get_all_members);
+
+my $get_all_stages = qq{
+
+  select distinct build_status.stage 
+  from build_status 
+    join nrecent_failures using (sysname,snapshot,branch)
+
+};
+
+my $all_stages = $db->selectcol_arrayref($get_all_stages);
+
 my $statement =<<EOS;
 
 
@@ -69,20 +105,22 @@ $sth->execute($max_days);
 while (my $row = $sth->fetchrow_hashref)
 {
     next if (@members && ! grep {$_ eq $row->{sysname} } @members);
+    next if (@stages && ! grep {$_ eq $row->{stage} } @stages);
+    next if (@branches && ! grep {$_ eq $row->{branch} } @branches);
     $row->{build_flags}  =~ s/^\{(.*)\}$/$1/;
     $row->{build_flags}  =~ s/,/ /g;
-       # enable-integer-datetimes is now the default
-       if ($row->{branch} eq 'HEAD' || $row->{branch} gt 'REL8_3_STABLE')
-       {
-               $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/);
-       }
+##     # enable-integer-datetimes is now the default
+##     if ($row->{branch} eq 'HEAD' || $row->{branch} gt 'REL8_3_STABLE')
+##     {
+##             $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;
@@ -103,7 +141,11 @@ $template->process('fstatus.tt',
                {statrows=>$statrows, 
                 sortby => $sortby,
                 max_days => $max_days,
-                members=> \@members} );
+                all_branches => $all_branches,
+                all_members => $all_members,
+                all_stages => $all_stages,
+                qmembers=> \@members,
+                qbranches => \@branches,
+                qstages => \@stages} );
 
 exit;
-