From b7ca5d74d4514f7bb3cd3f1ce742fc6a4b3ee2da Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Fri, 28 May 2004 22:11:42 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=3463
---
 checkin_notes                               | 13 +++++++++++++
 client/win/wingui_mainwindow.cpp            |  9 +++++++--
 html/inc/db_ops.inc                         |  1 +
 html/ops/failure_result_summary_by_host.php | 10 ++++++++--
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index f579369b6d..5bb1015d59 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -12780,3 +12780,16 @@ David  May 27 2004
 	doc/
 		graphics.png
 		graphics.sxd
+
+Rom    May 28 2004
+    - Fix screensaver issue where somebody may have configured a 0 blank time,
+      if so, the blank time is set to twenty minutes.
+    - Host properties on the BOINC Ops page now shows the nresults_today value
+    - The host failures report now displays the nresults_today
+
+    client/win/
+        wingui_mainwindow.cpp
+    html/inc
+        db_ops.inc
+    html/ops/
+        failure_result_summary_by_host.php
diff --git a/client/win/wingui_mainwindow.cpp b/client/win/wingui_mainwindow.cpp
index 43d8d74a19..b072e2d198 100755
--- a/client/win/wingui_mainwindow.cpp
+++ b/client/win/wingui_mainwindow.cpp
@@ -2216,8 +2216,13 @@ LRESULT CMainWindow::OnStartScreensaver(WPARAM wParam, LPARAM lParam)
 
     UtilGetRegKey(REG_BLANK_NAME, reg_blank_screen);
     UtilGetRegKey(REG_BLANK_TIME, reg_time_until_blank);
-    if (reg_blank_screen && reg_time_until_blank>0) {
-        blank_time = time(0) + reg_time_until_blank*60;
+    if (reg_blank_screen) {
+        if (reg_time_until_blank>0) {
+            blank_time = time(0) + reg_time_until_blank*60;
+        } else {
+            blank_time = time(0) + 1200; // After twenty mintues,
+                                         // blank the screen
+        }
     } else {
         blank_time = 0;
     }
diff --git a/html/inc/db_ops.inc b/html/inc/db_ops.inc
index e4ee17cff0..f4dc517329 100644
--- a/html/inc/db_ops.inc
+++ b/html/inc/db_ops.inc
@@ -515,6 +515,7 @@ function show_host($host) {
     row("% of time client on", 100*$host->on_frac." %");
     row("% of time host connected", 100*$host->connected_frac." %");
     row("% of time user active", 100*$host->active_frac." %");
+    row("# of results today", $host->nresults_today);
     row("Results", "<a href=db_action.php?table=result&detail=low&hostid=$host->id&sort_by=sent_time>click here</a>");
     end_table();
 
diff --git a/html/ops/failure_result_summary_by_host.php b/html/ops/failure_result_summary_by_host.php
index 6241010f03..f0e71209b1 100644
--- a/html/ops/failure_result_summary_by_host.php
+++ b/html/ops/failure_result_summary_by_host.php
@@ -48,6 +48,7 @@ SELECT
                end
            else host.os_version
        end AS OS_Version,
+       host.nresults_today AS Results_Today, 
        COUNT(*) AS error_count
 FROM   result
            left join host on result.hostid = host.id 
@@ -60,13 +61,14 @@ GROUP BY
        app_version_num DESC,
        hostid,
        OS_Name,
-       OS_Version
+       OS_Version,
+       host.nresults_today
 ";
 
 $result = mysql_query($main_query);
 
 echo "<table>\n";
-echo "<tr><th>App Version</th><th>Host ID</th><th>OS Name</th><th>OS Version</th><th>Error Count</th></tr>\n";
+echo "<tr><th>App Version</th><th>Host ID</th><th>OS Name</th><th>OS Version</th><th>Results Today</th><th>Error Count</th></tr>\n";
 
 while ($res = mysql_fetch_object($result)) {
 
@@ -88,6 +90,10 @@ while ($res = mysql_fetch_object($result)) {
     echo $res->OS_Version;
     echo "</td>";
 
+    echo "<td align=left valign=top>";
+    echo $res->Results_Today;
+    echo "</td>";
+
     echo "<td align=left valign=top>";
     echo $res->error_count;
     echo "</td>";