[llvm-commits] CVS: nightlytest-serverside/ProgramResults.php

[Jim Laskey]

Changes in directory nightlytest-serverside:

ProgramResults.php updated: 1.15 -> 1.16
---
Log message:

Debugging newly pass fail report attempt #7.


---
Diffs of the changes:  (+8 -6)

 ProgramResults.php |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)


Index: nightlytest-serverside/ProgramResults.php
diff -u nightlytest-serverside/ProgramResults.php:1.15 nightlytest-serverside/ProgramResults.php:1.16
--- nightlytest-serverside/ProgramResults.php:1.15	Wed Aug 30 16:00:05 2006
+++ nightlytest-serverside/ProgramResults.php	Wed Aug 30 16:08:06 2006
@@ -460,7 +460,7 @@
     }
     mysql_free_result($program_query);
 
-    $query = "SELECT * FROM tests WHERE night=$cur_id";
+    $query = "SELECT * FROM tests WHERE night=$cur_id ORDER BY program ASC";
     $program_query = mysql_query($query) or die (mysql_error());
     while($row = mysql_fetch_array($program_query)){
       $test_key = "{$row['measure']} - {$row['program']}";
@@ -502,7 +502,7 @@
     }
     mysql_free_result($program_query);
 
-    $query = "SELECT * FROM tests WHERE night=$prev_id";
+    $query = "SELECT * FROM tests WHERE night=$prev_id ORDER BY program ASC";
     $program_query = mysql_query($query) or die (mysql_error());
     while($row = mysql_fetch_array($program_query)){
       $test_key = "{$row['measure']} - {$row['program']}";
@@ -562,7 +562,7 @@
     $program_query = mysql_query($query) or die (mysql_error());
     while($row = mysql_fetch_array($program_query)){
       if(strcmp("{$row['result']}", "PASS")!==0){
-        $test_hash["{$row['measure']} - {$row['program']}"]=$row['result'];
+        $test_hash["{$row['program']}"]=$row['result'];
       }    
     }
     mysql_free_result($program_query);
@@ -570,10 +570,11 @@
     $query = "SELECT * FROM program WHERE night=$cur_id ORDER BY program ASC";
     $program_query = mysql_query($query) or die (mysql_error());
     while($row = mysql_fetch_array($program_query)){
-      $test_key = "{$row['measure']} - {$row['program']}";
+      $test_key = "{$row['program']}";
       if(isset($test_hash[$test_key]) && 
          strcmp($test_hash[$test_key], $row['result'])!==0){
-        $result .= $test_key . "<br>\n";
+        // $result .= $test_key . "<br>\n";
+        $result .= $row['result'] . ":" . $test_key . "<br>\n";
       }
     }
     mysql_free_result($program_query);
@@ -639,7 +640,8 @@
       $test_key = "{$row['program']}";
       if(isset($test_hash[$test_key]) && 
          strcmp($test_hash[$test_key], $row['result'])!==0){
-        $result .= $test_key . "<br>\n";
+        // $result .= $test_key . "<br>\n";
+        $result .= $row['result'] . ":" . $test_key . "<br>\n";
       }
     }
     mysql_free_result($program_query);