Commit 88a48050 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Minor cosmetic changes to the display.

parent 28206975
...@@ -33,7 +33,7 @@ echo "Show <a class='static' href='showexpstats.php3'> ...@@ -33,7 +33,7 @@ echo "Show <a class='static' href='showexpstats.php3'>
# Right now we show just the last 200 records entered. # Right now we show just the last 200 records entered.
# #
$query_result = $query_result =
DBQueryFatal("select t.*,e.* from testbed_stats as t ". DBQueryFatal("select e.*,t.*,t.idx as statno from testbed_stats as t ".
"left join experiment_stats as e on e.idx=t.exptidx ". "left join experiment_stats as e on e.idx=t.exptidx ".
"order by t.idx desc limit 200"); "order by t.idx desc limit 200");
...@@ -43,16 +43,18 @@ if (mysql_num_rows($query_result) == 0) { ...@@ -43,16 +43,18 @@ if (mysql_num_rows($query_result) == 0) {
echo "<table align=center border=1> echo "<table align=center border=1>
<tr> <tr>
<th>IDX</th> <th>#</th>
<th>Pid</th> <th>Pid</th>
<th>Eid</th> <th>Eid</th>
<th>ExptIdx</th>
<th>Time</th> <th>Time</th>
<th>Action</th> <th>Action</th>
<th>ExitCode</th> <th>ExitCode</th>
</tr>\n"; </tr>\n";
while ($row = mysql_fetch_assoc($query_result)) { while ($row = mysql_fetch_assoc($query_result)) {
$idx = $row[idx]; $idx = $row[statno];
$exptidx = $row[exptidx];
$pid = $row[pid]; $pid = $row[pid];
$eid = $row[eid]; $eid = $row[eid];
$when = $row[tstamp]; $when = $row[tstamp];
...@@ -60,9 +62,10 @@ while ($row = mysql_fetch_assoc($query_result)) { ...@@ -60,9 +62,10 @@ while ($row = mysql_fetch_assoc($query_result)) {
$ecode = $row[exitcode]; $ecode = $row[exitcode];
echo "<tr> echo "<tr>
<td><a href=showexpstats.php3?record=$idx>$idx</a></td> <td>$idx</td>
<td>$pid</td> <td>$pid</td>
<td>$eid</td> <td>$eid</td>
<td><a href=showexpstats.php3?record=$exptidx>$exptidx</a></td>
<td>$when</td> <td>$when</td>
<td>$action</td> <td>$action</td>
<td>$ecode</td> <td>$ecode</td>
......
...@@ -1816,8 +1816,9 @@ function SHOWGROUPSTATS($pid, $gid) { ...@@ -1816,8 +1816,9 @@ function SHOWGROUPSTATS($pid, $gid) {
function SHOWEXPTSTATS($pid, $eid) { function SHOWEXPTSTATS($pid, $eid) {
$query_result = $query_result =
DBQueryFatal("SELECT * from experiment_stats ". DBQueryFatal("select s.* from experiments as e ".
"where pid='$pid' and eid='$eid'"); "left join experiment_stats as s on e.idx=s.idx ".
"where e.pid='$pid' and e.eid='$eid'");
if (! mysql_num_rows($query_result)) { if (! mysql_num_rows($query_result)) {
return; return;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment