From 96b8bc39d02f4962e5d8f6528661f4d327ba3c81 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 12 Sep 2012 22:31:23 +0000
Subject: [PATCH] - user web: fix bug when do forum search on Google

svn path=/trunk/boinc/; revision=26101
---
 checkin_notes                     | 8 +++++++-
 html/user/forum_search_action.php | 2 +-
 sched/plan_class_spec.cpp         | 1 +
 sched/sched_types.h               | 4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 1c25c0cac8..eddc880ae9 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5680,7 +5680,7 @@ David  21 Aug 2012
 
 David  22 Aug 2012
     - file_upload_handler: bug fix
-    - volunteer storage: buf fixes
+    - volunteer storage: bug fixes
 
     vda/
         vda_lib2.cpp
@@ -5940,3 +5940,9 @@ Charlie 12 Sep 2012
         gpu_opencl.cpp
     lib/
         hostinfo.h
+
+David  12 Sept 2012
+    - user web: fix bug when do forum search on Google
+
+    html/user/
+        forum_search_action.php
diff --git a/html/user/forum_search_action.php b/html/user/forum_search_action.php
index 7e722acfde..db4eecc809 100644
--- a/html/user/forum_search_action.php
+++ b/html/user/forum_search_action.php
@@ -217,7 +217,7 @@ if (!count($thread) && !count($posts)){
     echo "<p>".tra("Sorry, couldn't find anything matching your search query. You can try to broaden your search by using less words (or less specific words).")."</p>
     <p>"
     .tra("You can also %1try the same search on Google.%2",
-         "<a href=\"http://www.google.com/search?domains=".URL_BASE."&sitesearch=".URL_BASE."/forum_thread.php&q=".htmlentities($search_keywords)."\">",
+         "<a href=\"http://www.google.com/search?domains=".URL_BASE."&sitesearch=".URL_BASE."forum_thread.php&q=".htmlentities($search_keywords)."\">",
          "</a>")
     ."</p>";
 }
diff --git a/sched/plan_class_spec.cpp b/sched/plan_class_spec.cpp
index 96b3b91b17..ebea4e5b6c 100644
--- a/sched/plan_class_spec.cpp
+++ b/sched/plan_class_spec.cpp
@@ -485,6 +485,7 @@ bool PLAN_CLASS_SPEC::check(SCHEDULER_REQUEST& sreq, HOST_USAGE& hu) {
         // I believe the first term here is just hu.projected_flops,
         // but I'm leaving it spelled out to match GPU scheduling 
         // code in sched_customize.cpp
+        //
         hu.peak_flops = gpu_peak_flops_scale*gpu_usage*cpp->peak_flops + hu.avg_ncpus*capped_host_fpops();
 
         if (!strcmp(gpu_type, "amd") || !strcmp(gpu_type, "ati")) {
diff --git a/sched/sched_types.h b/sched/sched_types.h
index 5eb7e73ee7..5f37f00ebe 100644
--- a/sched/sched_types.h
+++ b/sched/sched_types.h
@@ -52,7 +52,7 @@ struct RESOURCE {
     }
 };
 
-// message intended for human eyes
+// a message for the volunteer
 //
 struct USER_MESSAGE {
     std::string message;
@@ -71,7 +71,7 @@ struct HOST_USAGE {
         // Taken from host_app_version elapsed time statistics if available,
         // else on estimate provided by app_plan()
     double peak_flops;
-        // stored in result.estimated_flops, and used for credit calculations
+        // stored in result.flops_estimate, and used for credit calculations
     char cmdline[256];
 
     HOST_USAGE() {