Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- user web: fix bug when do forum search on Google 

svn path=/trunk/boinc/; revision=26101
This commit is contained in:
David Anderson 2012-09-12 22:31:23 +00:00
parent aff3b7675c
commit 96b8bc39d0
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkin_notes
View File

@ -5680,7 +5680,7 @@ David 21 Aug 2012
David 22 Aug 2012 David 22 Aug 2012
- file_upload_handler: bug fix - file_upload_handler: bug fix
- volunteer storage: buf fixes - volunteer storage: bug fixes
vda/ vda/
vda_lib2.cpp vda_lib2.cpp
@ -5940,3 +5940,9 @@ Charlie 12 Sep 2012
gpu_opencl.cpp gpu_opencl.cpp
lib/ lib/
hostinfo.h hostinfo.h
David 12 Sept 2012
- user web: fix bug when do forum search on Google
html/user/
forum_search_action.php

2
html/user/forum_search_action.php
View File

@ -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> 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>" <p>"
.tra("You can also %1try the same search on Google.%2", .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>") "</a>")
."</p>"; ."</p>";
} }

1
sched/plan_class_spec.cpp
View File

@ -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, // I believe the first term here is just hu.projected_flops,
// but I'm leaving it spelled out to match GPU scheduling // but I'm leaving it spelled out to match GPU scheduling
// code in sched_customize.cpp // code in sched_customize.cpp
//
hu.peak_flops = gpu_peak_flops_scale*gpu_usage*cpp->peak_flops + hu.avg_ncpus*capped_host_fpops(); 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")) { if (!strcmp(gpu_type, "amd") || !strcmp(gpu_type, "ati")) {

4
sched/sched_types.h
View File

@ -52,7 +52,7 @@ struct RESOURCE {
} }
}; };
// message intended for human eyes // a message for the volunteer
// //
struct USER_MESSAGE { struct USER_MESSAGE {
std::string message; std::string message;
@ -71,7 +71,7 @@ struct HOST_USAGE {
// Taken from host_app_version elapsed time statistics if available, // Taken from host_app_version elapsed time statistics if available,
// else on estimate provided by app_plan() // else on estimate provided by app_plan()
double peak_flops; 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]; char cmdline[256];
HOST_USAGE() { HOST_USAGE() {