From: Jeremy Harris Date: Wed, 28 Dec 2016 12:21:05 +0000 (+0000) Subject: Branch names may contain dots X-Git-Url: https://git.exim.org/buildfarm-server.git/commitdiff_plain/d6e7d31e04ba5e36e555171e290c182404bd287f Branch names may contain dots --- diff --git a/cgi-bin/show_failures.pl b/cgi-bin/show_failures.pl index 592ab4f..62d186e 100755 --- a/cgi-bin/show_failures.pl +++ b/cgi-bin/show_failures.pl @@ -23,7 +23,7 @@ my @members = grep {$_ ne "" } $query->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; +map { s/[^a-zA-Z0-9_ .-]//g; } @branches; my @stages = grep {$_ ne "" } $query->param('stage'); map { s/[^a-zA-Z0-9_ :-]//g; } @stages; diff --git a/cgi-bin/show_history.pl b/cgi-bin/show_history.pl index 49ce767..7d5219c 100755 --- a/cgi-bin/show_history.pl +++ b/cgi-bin/show_history.pl @@ -31,7 +31,7 @@ die $DBI::errstr unless $db; my $query = new CGI; my $member = $query->param('nm'); $member =~ s/[^a-zA-Z0-9_ -]//g; -my $branch = $query->param('br'); $branch =~ s/[^a-zA-Z0-9_ -]//g; +my $branch = $query->param('br'); $branch =~ s/[^a-zA-Z0-9_ .-]//g; my $hm = $query->param('hm'); $hm =~ s/[^a-zA-Z0-9_ -]//g; $hm = '240' unless $hm =~ /^\d+$/; @@ -83,6 +83,9 @@ while (my $row = $sth->fetchrow_hashref) $row->{os_version} = $latest_personality->[0]; $row->{compiler_version} = $latest_personality->[1]; } + + # convert list of individual testresults to list of ranges of equal results + # for speed of display if (defined($row->{log_text})) { # convert to a hash, find ranges, output list of ranges my $h = { split /\s+/, $row->{log_text} };