Drop 4.next

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

diff --git a/cgi-bin/show_status.pl b/cgi-bin/show_status.pl
index baf9623197acae357d3ad9f7606a7abcb035bf8b..1ac959ebb5cc600fa90d17d80cd7d6829af69b61 100755 (executable)
--- a/cgi-bin/show_status.pl
+++ b/cgi-bin/show_status.pl
@@ -19,7 +19,7 @@ use FindBin qw($RealBin);
 require "$RealBin/../BuildFarmWeb.pl";
 
 my $query = new CGI;
 require "$RealBin/../BuildFarmWeb.pl";
 
 my $query = new CGI;

-my @members = $query->param('member');
+my @members = $query->multi_param('member');

 map { s/[^a-zA-Z0-9_ -]//g; } @members;
 
 my $dsn="dbi:Pg:dbname=$dbname";
 map { s/[^a-zA-Z0-9_ -]//g; } @members;
 
 my $dsn="dbi:Pg:dbname=$dbname";


@@ -52,7 +52,9 @@ my $statement =<<EOS;
        b.*,
        s.log_text
   FROM dashboard_mat b LEFT JOIN build_status_log s
        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'
+  ON    b.sysname = s.sysname
+    AND 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
   ORDER BY b.branch = 'master' desc,
         b.branch desc, $sort_clause 
         b.snapshot desc


@@ -63,16 +65,61 @@ EOS
 my $statrows=[];
 my $sth=$db->prepare($statement);
 $sth->execute;
 my $statrows=[];
 my $sth=$db->prepare($statement);
 $sth->execute;

+
+# walk the set of result rows from the SQL query above

 while (my $row = $sth->fetchrow_hashref)
 {
     next if (@members && ! grep {$_ eq $row->{sysname} } @members);
 while (my $row = $sth->fetchrow_hashref)
 {
     next if (@members && ! grep {$_ eq $row->{sysname} } @members);

+

     $row->{build_flags}  =~ s/^\{(.*)\}$/$1/;
     $row->{build_flags}  =~ s/,/ /g;
     $row->{build_flags}  =~ s/_PC\b//g;
     $row->{build_flags} = lc($row->{build_flags});
     $row->{build_flags}  =~ s/^\{(.*)\}$/$1/;
     $row->{build_flags}  =~ s/,/ /g;
     $row->{build_flags}  =~ s/_PC\b//g;
     $row->{build_flags} = lc($row->{build_flags});

+

     if (defined($row->{log_text}))
     if (defined($row->{log_text}))

-      {                # convert to a hash
-      $row->{log_text} = { split /\s+/, $row->{log_text} };
+      {                # convert to a hash, find ranges, output list of ranges
+      my $h = { split /\s+/, $row->{log_text} };
+      my ($i, $start, $last);
+      my @ranges;
+
+      foreach my $k (sort {$a<=>$b} keys %$h)
+       {
+       if (defined $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,
+           # 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;
+           }
+         else
+           {
+           # bump the size of this range
+           $i++;
+           }
+         }
+       else
+         {
+         # First ever range for this row
+         $start = $k;
+         $i = 1;
+         }
+       $last = $k;
+       }
+      if (defined $start)
+       {
+       # close out the final range
+        push @ranges, sprintf("%s %s %s", $h->{$start},  $start,  $i);
+       }
+
+      $row->{log_text} = \@ranges;

       }
     push(@$statrows,$row);
 }
       }
     push(@$statrows,$row);
 }