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 = grep {$_ ne "" } $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->param('branch');
-map { s/[^a-zA-Z0-9_ -]//g; } @branches;
-my @stages = grep {$_ ne "" } $query->param('stage');
-map { s/[^a-zA-Z0-9_ -]//g; } @stages;
+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;
my $get_all_stages = qq{
- select distinct stage
+ select distinct build_status.stage
from build_status
join nrecent_failures using (sysname,snapshot,branch)
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;
qstages => \@stages} );
exit;
-