support sys notes

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

diff --git a/cgi-bin/show_log.pl b/cgi-bin/show_log.pl
index 414b9e67dc3dd4b4846683665cf5a3ae7a7078c0..839af547f41a522b0cf113bcacc05867cf7d63ba 100755 (executable)
--- a/cgi-bin/show_log.pl
+++ b/cgi-bin/show_log.pl
@@ -66,7 +66,8 @@ EOS
           select operating_system, os_version, 
                  compiler, compiler_version, 
                  architecture,
           select operating_system, os_version, 
                  compiler, compiler_version, 
                  architecture,

-               replace(owner_email,'\@',' [ a t ] ') as owner_email
+                replace(owner_email,'\@',' [ a t ] ') as owner_email,
+                sys_notes_ts::date AS sys_notes_date, sys_notes

           from buildsystems 
           where status = 'approved'
                 and name = ?
           from buildsystems 
           where status = 'approved'
                 and name = ?


@@ -76,7 +77,7 @@ EOS
        $sth=$db->prepare($statement);
        $sth->execute($system);
        $info_row=$sth->fetchrow_hashref;
        $sth=$db->prepare($statement);
        $sth->execute($system);
        $info_row=$sth->fetchrow_hashref;

-        $sysinfo = join(" ",@$row);
+        # $sysinfo = join(" ",@$row);

        $sth->finish;
        $db->disconnect;
 }
        $sth->finish;
        $db->disconnect;
 }


@@ -162,6 +163,25 @@ if ($stage eq 'OK')
     </table>
 EOHTML
 
     </table>
 EOHTML
 

+    if ($info_row->{sys_notes})
+    {
+        print <<EOHTML;
+    <br />
+    <table>
+     <tr>
+       <th class="head" rowspan="2">System Notes</th>
+       <th>Date</th>
+       <th>Notes</th>
+     </tr>
+     <tr>
+      <td>$info_row->{sys_notes_date}</td>
+      <td>$info_row->{sys_notes}</td>
+     </tr>
+   </table>
+EOHTML
+
+    }
+

 for my $logstage (@log_file_names)
 {
     print "<br /> <table><tr><th class='head' rowspan='$logrows'>Stage Logs</th>\n"
 for my $logstage (@log_file_names)
 {
     print "<br /> <table><tr><th class='head' rowspan='$logrows'>Stage Logs</th>\n"


@@ -265,9 +285,28 @@ print <<EOHTML;
         <td>$info_row->{architecture}</td>
         <td>$info_row->{owner_email}</td>
     </tr>
         <td>$info_row->{architecture}</td>
         <td>$info_row->{owner_email}</td>
     </tr>

-    </table>
+  </table>

 EOHTML
 
 EOHTML
 

+    if ($info_row->{sys_notes})
+    {
+        print <<EOHTML;
+    <br />
+    <table>
+     <tr>
+       <th class="head" rowspan="2">System Notes</th>
+       <th>Date</th>
+       <th>Notes</th>
+     </tr>
+     <tr>
+      <td>$info_row->{sys_notes_date}</td>
+      <td>$info_row->{sys_notes}</td>
+     </tr>
+   </table>
+EOHTML
+
+    }
+

 for my $logstage (@log_file_names)
 {
     print "<br /> <table><tr><th class='head' rowspan='4'>Stage Logs</th>\n"
 for my $logstage (@log_file_names)
 {
     print "<br /> <table><tr><th class='head' rowspan='4'>Stage Logs</th>\n"