Fix multiple lines returned for animal on status page

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

diff --git a/cgi-bin/show_status.pl b/cgi-bin/show_status.pl
index 04c918cd543c1824be0277a737ac2b8c7a5f4d1e..d52394fec86ff93a8682fd94ddef18dc3da942d8 100755 (executable)
--- a/cgi-bin/show_status.pl
+++ b/cgi-bin/show_status.pl
@@ -15,11 +15,11 @@ use CGI;
 
 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 @members = $query->multi_param('member');
 map { s/[^a-zA-Z0-9_ -]//g; } @members;
 
 my $dsn="dbi:Pg:dbname=$dbname";
@@ -48,11 +48,16 @@ my $db = DBI->connect($dsn,$dbuser,$dbpass,{pg_expand_array => 0})
 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.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
 
 EOS
 ;
@@ -67,6 +72,41 @@ while (my $row = $sth->fetchrow_hashref)
     $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;