*** empty log message ***

svn path=/trunk/boinc/; revision=3178
This commit is contained in:
David Anderson 2004-03-26 22:56:45 +00:00
parent 5877596736
commit a815f03c1c
3 changed files with 80 additions and 62 deletions

View File

@ -10548,8 +10548,8 @@ Rom Mar 16 2004
wingui_mainwindow.cpp
kevin 17 March 2004
checked in signal handling code. Uses sigaction. If signal is
originally ignored, do not handle signals.
checked in signal handling code. Uses sigaction. If signal is
originally ignored, do not handle signals.
David Mar 18 2004
- Remove "confirm executables" preference.
@ -10566,9 +10566,9 @@ David Mar 18 2004
prefs.inc
kevin 18 March 2004
- exit status of application set to nonzero value if there is an
- exit status of application set to nonzero value if there is an
uncaught signal.
client/
client/
app.C
Rom Mar 18 2004
@ -10600,14 +10600,14 @@ David Mar 19 2004
profile_menu.php
white.css
kevin March 19 2004
kevin March 19 2004
- Scheduler: don't handle partial requests
(i.e. missing </scheduler_request> tag)
lib/
error_numbers.h
sched/
server_types.C
handle_request.C
lib/
error_numbers.h
sched/
server_types.C
handle_request.C
David Mar 20 2004
- Various changes to the way CPU benchmarking is done,
@ -10645,8 +10645,8 @@ David Mar 20 2004
cs_prefs.C
file_names.h
gui_rpc_server.C
win/
wingui_mainwindow.cpp
win/
wingui_mainwindow.cpp
doc/
various
lib/
@ -10730,7 +10730,7 @@ Jeff Mar 23 2004
or expired.
sched/
validate.C
validate.C
Rom Mar 23 2004
- client applications don't really need to dump leak detection information
@ -10740,17 +10740,17 @@ Rom Mar 23 2004
boinc_api.c
David Mar 23 2004
- Initial global prefs (as defined in GLOBAL_PREFS::init()) should
impose minimal restrictions, so that the client can do its first
scheduler RPC and get global prefs from a server
- Initial global prefs (as defined in GLOBAL_PREFS::init()) should
impose minimal restrictions, so that the client can do its first
scheduler RPC and get global prefs from a server
- Fix bug where benchmarks always run on Win client startup
- Improve startup and prefs messages
client/
client_state.C
client_types.C
cs_benchmark.C
prefs.C
client_state.C
client_types.C
cs_benchmark.C
prefs.C
David Mar 23 2004
- Turned off the entire "infeasible result" mechanism for now.
@ -10797,11 +10797,11 @@ Rom Mar 24 2004
upper_case.vcproj
kevin Mar 24 2004
- class boinc_base_exception: changed order of initialization
- class boinc_base_exception: changed order of initialization
in constructor so that initialization matches declaration.
lib/
exception.h
lib/
exception.h
Rom Mar 24 2004
- I was a little to agressive in cleaning up boinc_api.c and removed some
@ -10877,22 +10877,22 @@ David Mar 24 2004
sighandle.C,h (removed)
David Mar 24 2004
- get the above stuff working on Windows
- get the above stuff working on Windows
client/
app.C
cs_apps.C
lib/
diagnostics.C,h
error_numbers.h
client/
app.C
cs_apps.C
lib/
diagnostics.C,h
error_numbers.h
David Mar 24 2004
- add log flag to suppress file-size checking on app startup
- add log flag to suppress file-size checking on app startup
client/
client_types.C
log_flags.C,h
client/
client_types.C
log_flags.C,h
Rom Mar 25 2004
- I have made SETI_BOINC Glut Free, Basically copied font code from glut
and put it into the glut folder.
@ -10974,8 +10974,17 @@ Rom Mar 26 2004
app_ipc.c
Rom Mar 26 2004
- Update versions started to complain about PDB files, so tell it to ignore them
for determining platforms
- Update versions started to complain about PDB files,
so tell it to ignore them for determining platforms
tools/
update_versions
David Mar 26 2004
- combine RAC when merging hosts
html/
inc/
forum.inc
user/
host_edit_action.php

View File

@ -247,6 +247,14 @@ function updatePost($postID, $content) {
return true;
}
function updateThread($threadID, $title) {
$x = addslashes(sanitize_html(stripslashes($title)));
$sql = "UPDATE thread SET title = \"$x\" WHERE id = " . $threadID;
$result = mysql_query($sql);
if (!$result) return false;
return true;
}
/* display functions */
function show_posts($thread, $sort_style, $filter, $show_controls=true, $do_coloring=true, $is_helpdesk=false) {

View File

@ -18,32 +18,33 @@ function get_host($hostid, $user) {
}
function merge_hosts($old_host, $new_host) {
if ($old_host->id == $new_host->id) {
fail("same host");
}
if (!hosts_compatible($old_host, $new_host)) {
fail("Can't merge hosts - they're incompatible");
}
if ($old_host->id == $new_host->id) {
fail("same host");
}
if (!hosts_compatible($old_host, $new_host)) {
fail("Can't merge hosts - they're incompatible");
}
echo "<br>Merging $old_host->id into $new_host->id\n";
echo "<br>Merging $old_host->id into $new_host->id\n";
// update the database:
// - add credit from old to new host
// - change results to refer to new host
// - delete old host
$t = $old_host->total_credit + $new_host->total_credit;
$result = mysql_query("update host set total_credit=$t where id=$new_host->id");
if (!result) {
fail("Couldn't update credit of new host");
}
$result = mysql_query("update result set hostid=$new_host->id where hostid=$old_host->id");
if (!$result) {
fail("Couldn't update results");
}
$result = mysql_query("delete from host where id=$old_host->id");
if (!$result) {
fail("Couldn't delete host");
}
// update the database:
// - add credit from old to new host
// - change results to refer to new host
// - delete old host
$total_credit = $old_host->total_credit + $new_host->total_credit;
$recent_credit = $old_host->expavg_credit + $new_host->expavg_credit;
$result = mysql_query("update host set total_credit=$total_credit, expavg_credit=$recent_credit where id=$new_h
if (!result) {
fail("Couldn't update credit of new host");
}
$result = mysql_query("update result set hostid=$new_host->id where hostid=$old_host->id");
if (!$result) {
fail("Couldn't update results");
}
$result = mysql_query("delete from host where id=$old_host->id");
if (!$result) {
fail("Couldn't delete host");
}
}
db_init();