From cdc4e3c22e0b0dcd19edb4031d07e8a0531232f6 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 11 Jun 2003 23:36:44 +0000
Subject: [PATCH] result summary on admin web

svn path=/trunk/boinc/; revision=1401
---
 html/ops/index.html         | 16 ----------
 html/ops/index.php          |  2 ++
 html/ops/result_summary.php | 63 +++++++++++++++++++++++++++++++++++++
 sched/handle_request.C      |  5 ---
 4 files changed, 65 insertions(+), 21 deletions(-)
 delete mode 100644 html/ops/index.html
 create mode 100644 html/ops/result_summary.php

diff --git a/html/ops/index.html b/html/ops/index.html
deleted file mode 100644
index 4f0869b357..0000000000
--- a/html/ops/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<title>BOINC Project Management</title>
-<h2>BOINC Project Management</h2>
-<p>
-Browse database:
-<ul> 
-<li><a href=db.php?show=platform>Platforms</a>
-<li><a href=db.php?show=app>Applications</a>
-<li><a href=db.php?show=app_version>Application versions</a>
-<li><a href=db.php?show=user>Users</a>
-<li><a href=db.php?show=team>Teams</a>
-<li><a href=db.php?show=host>Hosts</a>
-<li><a href=db.php?show=workunit>Workunits</a>
-<li><a href=db.php?show=result>Results</a>
-</ul>
-<a href=stripchart.cgi>Stripcharts</a>
-
diff --git a/html/ops/index.php b/html/ops/index.php
index 1fbb769774..7098e7fd8a 100644
--- a/html/ops/index.php
+++ b/html/ops/index.php
@@ -19,6 +19,8 @@ Browse database:
 <li><a href=db.php?show=workunit>Workunits</a>
 <li><a href=db.php?show=result>Results</a>
 </ul>
+<a href=result_summary.php?nsecs=86400>Result summary, last 24 hours</a>
+<br>
 <a href=$cgi_url/stripchart.cgi>Stripcharts</a>
 
 EOT;
diff --git a/html/ops/result_summary.php b/html/ops/result_summary.php
new file mode 100644
index 0000000000..8494404577
--- /dev/null
+++ b/html/ops/result_summary.php
@@ -0,0 +1,63 @@
+<?php
+
+    // show summary of results that have been received or timed out recently
+
+    require_once("util.inc");
+
+    db_init();
+    page_head("Result summary");
+
+    $server_state = array();
+    $outcome = array();
+    $client_state = array();
+
+    $nsecs = $_GET["nsecs"];
+
+    for ($ss=1; $ss<6; $ss++) {
+        $server_state[$ss] = 0;
+    }
+    for ($ro=0; $ro<6; $ro++) {
+        $outcome[$ro] = 0;
+    }
+    for ($cs=1; $cs<6; $cs++) {
+        $client_state[$cs] = 0;
+    }
+
+    $x = $nsecs/3600.;
+    echo "Results that have finished in last $x hours\n";
+    $y = time() - $nsecs;
+    $result = mysql_query("select * from result where received_time > $y");
+    while ($res = mysql_fetch_object($result)) {
+        $server_state[$res->server_state] += 1;
+        if ($res->server_state == 5) {
+            $outcome[$res->outcome] += 1;
+            if ($res->outcome == 3) {
+                $client_state[$res->client_state] += 1;
+            }
+        }
+    }
+    mysql_free_result($result);
+
+    start_table();
+    echo "<tr><th>Server state</th><th># results</th></tr>\n";
+    for ($ss=1; $ss<6; $ss++) {
+        row2(result_server_state_string($ss), $server_state[$ss]);;
+    }
+    end_table();
+
+    start_table();
+    echo "<tr><th>Outcome of 'Over' results</th><th># results</th></tr>\n";
+    for ($ro=0; $ro<6; $ro++) {
+        row2(result_outcome_string($ro), $outcome[$ro]);
+    }
+    end_table();
+
+    start_table();
+    echo "<tr><th>Client state of 'Client error' results</th><th># results</th></tr>\n";
+    for ($cs=1; $cs<6; $cs++) {
+        row2(result_client_state_string($cs), $client_state[$cs]);
+    }
+    end_table();
+
+    page_tail();
+?>
diff --git a/sched/handle_request.C b/sched/handle_request.C
index 27c0dbb696..f413056085 100644
--- a/sched/handle_request.C
+++ b/sched/handle_request.C
@@ -403,8 +403,6 @@ int update_host_record(SCHEDULER_REQUEST& sreq, HOST& xhost) {
 
     compute_credit_rating(host);
 
-    safe_strcpy(host.projects, sreq.projects_xml);
-
     retval = host.update();
     if (retval) {
         sprintf(buf, "host.update() failed: %d\n", retval);
@@ -493,9 +491,6 @@ int handle_results(
         if (result.server_state == RESULT_SERVER_STATE_OVER) {
             result.file_delete_state = FILE_DELETE_READY;
         }
-        if (result.server_state == RESULT_SERVER_STATE_IN_PROGRESS) {
-            result.server_state = RESULT_SERVER_STATE_OVER;
-        }
 
         if (result.hostid != sreq.hostid) {
             sprintf(buf,