From d21ae620c5fc753b4bbd1b92bb42f650f70d8513 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 5 Jan 2023 16:15:28 +0000 Subject: [PATCH] split status-bar ranges on noncotiguous testcase numbers --- cgi-bin/show_status.pl | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cgi-bin/show_status.pl b/cgi-bin/show_status.pl index 26967c0..1ac959e 100755 --- a/cgi-bin/show_status.pl +++ b/cgi-bin/show_status.pl @@ -79,19 +79,22 @@ while (my $row = $sth->fetchrow_hashref) 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 ($i, $start, $last); my @ranges; foreach my $k (sort {$a<=>$b} keys %$h) { if (defined $start) { - if ($h->{$k} ne $h->{$start}) + if ($h->{$k} ne $h->{$start} || $k != $last + 1) { # The result (skiped, Passed, Failed) for this testcase number - # is different to the start one of the range. Reset the - # start and the count, for a new range. + # is different to the start one of the range, + # or the range became non-contiguous. + # Add text for the range to list of ranges + # (these three elements get used by "status.tt" BLOCK colourbar) + # Reset the start and the count, for a new range. + push @ranges, sprintf("%s %s %s", $h->{$start}, $start, $i); $start = $k; $i = 1; @@ -108,10 +111,11 @@ while (my $row = $sth->fetchrow_hashref) $start = $k; $i = 1; } + $last = $k; } if (defined $start) { - # add text for the range to list of ranges + # close out the final range push @ranges, sprintf("%s %s %s", $h->{$start}, $start, $i); } -- 2.30.2