use upgraded personalities consistently on all pages

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

diff --git a/cgi-bin/show_history.pl b/cgi-bin/show_history.pl
index f1fa13cd6f8134f7af9ca4d4298a37c1375740bb..902fdb5b58a46821ab4feee3d441ff6b6a86361e 100755 (executable)
--- a/cgi-bin/show_history.pl
+++ b/cgi-bin/show_history.pl
@@ -28,6 +28,13 @@ 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+$/;
 
+my $latest_personality = $db->selectrow_arrayref(q{
+            select os_version, compiler_version
+            from personality
+            where name = ?
+            order by effective_date desc limit 1
+       }, undef, $member);
+
 # we don't really need to do this join, since we only want
 # one row from buildsystems. but it means we only have to run one
 # query. If it gets heavy we'll split it up and run two
@@ -56,8 +63,14 @@ $sth->execute($member,$branch);
 while (my $row = $sth->fetchrow_hashref)
 {
     $row->{owner_email} =~ s/\@/ [ a t ] /;
-       push(@$statrows,$row);
+    if ($latest_personality)
+    {
+       $row->{os_version} = $latest_personality->[0];
+       $row->{compiler_version} = $latest_personality->[1];
+    }
+    push(@$statrows,$row);
 }
+
 $sth->finish;
 
 $db->disconnect;