From 481d5dd45ba6292ee338b4f52a011cb5740aa5b5 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 21 Dec 2007 16:27:38 +0000
Subject: [PATCH] - compile fixes (remove comma after last element of enum)

svn path=/trunk/boinc/; revision=14430
---
 checkin_notes                |  8 +++++++-
 doc/dg.php                   | 16 ++++++++--------
 doc/poll_results.php         |  4 +++-
 languages/translations/en.po |  2 +-
 lib/common_defs.h            |  2 +-
 lib/prefs.h                  |  2 +-
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 8195ff7b26..40a16159f2 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -12397,4 +12397,10 @@ Charlie 19 Dec 07
         buildjpeg.sh
         BuildMacBOINC.sh
         buildWxMac.sh
-   
\ No newline at end of file
+
+David  21 Dec 2007
+    - compile fixes (remove comma after last element of enum)
+
+    lib/
+        prefs.h
+        common_defs.h
diff --git a/doc/dg.php b/doc/dg.php
index e6ed4c9bf3..5812c3d91b 100644
--- a/doc/dg.php
+++ b/doc/dg.php
@@ -5,15 +5,15 @@ find_translation("dg.html");
 
 require_once("docutil.php");
 
-page_head("Desktop grid computing with BOINC");
+page_head("Grid computing with BOINC");
 
 echo "
-<h2>Desktop grid versus volunteer computing</h2>
+<h2>Grid versus volunteer computing</h2>
 <p>
-<b>Desktop grid computing</b>
+<b>Grid computing</b>
 is a form of distributed computing in which
 an organization (such as a business)
-uses its existing desktop PCs to handle its own
+uses its existing computers to handle its own
 long-running computational tasks.
 This differs from volunteer computing in several ways:
 <ul>
@@ -28,11 +28,11 @@ be completely invisible and out of the control of the PC user.
 <li> Client deployment is typically automated.
 </ul>
 
-<h2>BOINC as a desktop grid computing platform</h2>
+<h2>BOINC as a grid computing platform</h2>
 <p>
 Although it was originally designed for volunteer computing,
-BOINC works very well for desktop grid computing.
-The steps in creating a desktop grid are:
+BOINC works very well for grid computing.
+The steps in creating a grid are:
 <ul>
 <li>
 <a href=trac/wiki/CreateProjectOutline>Set up a BOINC server</a>,
@@ -64,7 +64,7 @@ or access its files,
 configure your firewall to prevent HTTP access to your BOINC server.
 
 <p>
-For more information on desktop grid computing using BOINC,
+For more information on grid computing using BOINC,
 and some useful pre-compiled software, visit
 <a href=http://desktopgrid.hu/>Desktopgrid.hu</a>.
 
diff --git a/doc/poll_results.php b/doc/poll_results.php
index 614f49785c..bb90f3aed0 100644
--- a/doc/poll_results.php
+++ b/doc/poll_results.php
@@ -36,7 +36,7 @@ function parse_xml($resp, &$sums) {
         $tag = $matches[1];
         $val = $matches[2];
         if (strstr($tag, 'text')) {
-            if ($val) {
+            if ($val && $resp->update_time > 1197202264) {
                 $val = str_replace("\\r\\n", "\n", urldecode($val));
                 $val = str_replace('\\\\\\', '', $val);
                 $d = gmdate("g:i A \U\T\C, F d Y", $resp->update_time);
@@ -67,6 +67,8 @@ function other_link($sums, $other_name, $link_text, $ntotal) {
         $b = bar($n, $ntotal);
         $y .= "$b <a href=$fname>$link_text</a>";
         $f = fopen($fname, "w");
+        $old_name = str_replace(".html", ".old.html", $fname);
+        fwrite($f, "<a href=$old_name>Old responses</a><hr>\n");
         foreach ($sums[$other_name] as $text) {
             if (!strstr($text, '<a')) {
                 fwrite($f, $text);
diff --git a/languages/translations/en.po b/languages/translations/en.po
index 2341beff63..1089e94f09 100644
--- a/languages/translations/en.po
+++ b/languages/translations/en.po
@@ -751,4 +751,4 @@ msgid "HOME_BOINC"
 msgstr "Berkeley Open Infrastructure for Network Computing"
 
 msgid "HOME_BOINC_DESC"
-msgstr "Open-source software for %svolunteer computing%s and %sdesktop grid computing%s.
+msgstr "Open-source software for %svolunteer computing%s and %sgrid computing%s.
diff --git a/lib/common_defs.h b/lib/common_defs.h
index aa438a3620..96b76b6e92 100644
--- a/lib/common_defs.h
+++ b/lib/common_defs.h
@@ -110,7 +110,7 @@ enum SUSPEND_REASON {
     SUSPEND_REASON_BENCHMARKS = 16,
     SUSPEND_REASON_DISK_SIZE = 32,
     SUSPEND_REASON_CPU_USAGE_LIMIT = 64,
-    SUSPEND_REASON_NO_RECENT_INPUT = 128,
+    SUSPEND_REASON_NO_RECENT_INPUT = 128
 };
 
 // States of a result on a client.
diff --git a/lib/prefs.h b/lib/prefs.h
index 698735bb89..5f8105e8c7 100644
--- a/lib/prefs.h
+++ b/lib/prefs.h
@@ -80,7 +80,7 @@ public:
     enum TimeMode {
         Always = 7000,
         Never,
-        Between,
+        Between
     };
     TIME_SPAN()
         : start_hour(0), end_hour(0) {}