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 $statement =<<EOS;
- select timezone('GMT'::text, now())::timestamp(0) without time zone - b.snapshot AS when_ago, b.*
- from dashboard_mat b
- order by branch = 'master' desc,
- branch desc, $sort_clause
- snapshot desc
+ SELECT timezone('GMT'::text, now())::timestamp(0) without time zone - b.snapshot AS when_ago,
+ b.*,
+ s.log_text
+ FROM dashboard_mat b LEFT JOIN build_status_log s
+ ON b.snapshot = s.snapshot AND s.log_stage = 'test-results.log'
+ ORDER BY b.branch = 'master' desc,
+ b.branch desc, $sort_clause
+ b.snapshot desc
EOS
;
$row->{build_flags} =~ s/,/ /g;
$row->{build_flags} =~ s/_PC\b//g;
$row->{build_flags} = lc($row->{build_flags});
+ if (defined($row->{log_text}))
+ { # convert to a hash, find ranges, output list of ranges
+ my $h = { split /\s+/, $row->{log_text} };
+ my $i;
+ my $start;
+ my @ranges;
+
+ foreach my $k (sort {$a<=>$b} keys %$h)
+ {
+ if (defined $start)
+ {
+ if ($h->{$k} ne $h->{$start})
+ {
+ push @ranges, sprintf("%s %s %s", $h->{$start}, $start, $i);
+ $start = $k;
+ $i = 1;
+ }
+ else
+ {
+ $i++;
+ }
+ }
+ else
+ {
+ $start = $k;
+ $i = 1;
+ }
+ }
+ if (defined $start)
+ {
+ push @ranges, sprintf("%s %s %s", $h->{$start}, $start, $i);
+ }
+
+ $row->{log_text} = \@ranges;
+ }
push(@$statrows,$row);
}
$sth->finish;