diff --git a/checkin_notes b/checkin_notes index aa80b1dbce..94d9bb3905 100755 --- a/checkin_notes +++ b/checkin_notes @@ -6014,7 +6014,7 @@ Karl 2003/08/25 - 2003/09/02 Makefile.am add.py (added) sign_executable.C (added) - backend_lib.C + backend_lib.C backend_lib.h lib/ crypt.C @@ -6024,7 +6024,7 @@ Karl 2003/08/25 - 2003/09/02 db_mid.py (added) database.py (added) Makefile.am - + Karl 2003/09/02 - temporarily remove satellite test cases from 'make check' @@ -6054,7 +6054,7 @@ David Sept 3 2003 This changes the client/server RPC format and the DB format, so it will require a major version number increment - + client/ app.C client_state.C @@ -6075,7 +6075,7 @@ David Sept 3 2003 create_work.C quarl 2003/09/03 - - overhauled python scripts + - overhauled python scripts - reorganized directory structure. Now 'modules' are under boinc/py/Boinc (so you can do "from Boinc import *"). @@ -6114,7 +6114,7 @@ quarl 2003/09/03 doc/ python.php (added) - software.php + software.php test.php tools.php (added) tool_add.php (added) @@ -6157,7 +6157,7 @@ David Sept 5 2003 by a global object "boinc_db" of this class. You're free to have others (e.g. "app_db" in the work gen or assimilator for an app) - + db/ boinc_db.C,h db_base.C,h @@ -6289,9 +6289,9 @@ Jeff 2003/09/17 setiathome-4.xx_all_platforms_beta - for both seti_boinc and boinc. They both make on solaris without serious - error and the resulting seti client links without error with the resulting - boinc libs. + for both seti_boinc and boinc. They both make on solaris without serious + error and the resulting seti client links without error with the resulting + boinc libs. Karl,Eric Heien 2003/09/18 - fixed some pre-ANSI C @@ -6371,7 +6371,7 @@ Eric K 9/24/03 other unprintable -> "&#nnnd;" The decoder recognizes a larger number of translations for single byte entities found in XML/HTML. - - Added check for header to configure scripts. + - Added check for header to configure scripts. (Used by xml_util.[Ch] if found). lib/xml_util.[Ch] @@ -6382,7 +6382,7 @@ David Sept 27 2003 - add app_name to APP_INIT_DATA structure (so that an app can know its own name, and in particular so that we can use it to title its window) - + api/ boinc_api.h windows_opengl.C @@ -6413,12 +6413,12 @@ Karl 2003/09/28 setup_project.py tools/ dbcheck_files_exist - + David Sept 30 2003 - Core client: if get 404 error (not found) when downloading file, treat it as permanent error. (not tested) - + api/ boinc_api.C,h client/ @@ -6461,7 +6461,7 @@ Eric Oct 1 2003 11:15 am - Moved OpenGL and header and library finding to a macro file sah_grx.m4 (an identical macro file exists in seti_boinc) - Will verify it works on windows in the next hour or so - + Makefile.in aclocal.m4 config.h.in @@ -6486,8 +6486,8 @@ Eric Oct 2 2003 -moved xml_indent() from seti_boinc/db/sqlrow.[cpp,h] to i boinc/lib/xml_util.[C,h] - -fixed problems with graphics_api.h - + -fixed problems with graphics_api.h + api/graphics_api.h lib/xml_util.[Ch] @@ -6582,7 +6582,7 @@ David Oct 6 2003 What's in shared memory may be way out of date. E.g. it may no longer be in server state UNSENT. Hopefully this fixes the missing-input-file bug!! - + sched/ handle_request.C @@ -6650,7 +6650,7 @@ Karl 2003/10/08 test_uc.py - transitioner: fixed bug in sscan_hex_data() with \r or other whitespace - - transitioner: log more + - transitioner: log more - file_upload_handler: log more lib/ @@ -6687,7 +6687,7 @@ Oliver Oct 10 2003 graphics_api.c reduce.c windows_opengl.c - + Karl 2003/10/11 - Astropulse: output in index by samples, rather than bytes + fft bin; - indicate that output is finished; also make it valid XML @@ -6738,7 +6738,7 @@ Karl 2003-10-13 Makefile.am Oliver Oct 13 2003 - - stars now draw in visible pyramid + - stars now draw in visible pyramid api/ gutil.C,h @@ -6779,7 +6779,7 @@ David Oct 14 2003 gutil.C,h Karl 2003-10-14 - - makefiles: + - makefiles: - fixed some issues when building outside of source tree - fixed some missing 'make dist' files - fixed "ln -s start stop" bug @@ -6792,6 +6792,7 @@ Karl 2003-10-14 lib/ countries.C (removed) + Makefile.am tools/ country_select.C (removed) @@ -6800,3 +6801,15 @@ Karl 2003-10-14 html_user/ countries.inc (added) util.inc + +Karl 2003-10-14 + - added Rank column to top users; made presentation consistent for top + teams/users/hosts + + html_user/ + top_teams.php + top_users.php + top_hosts.php + team.inc + user.inc + host.inc diff --git a/html/user/team.inc b/html/user/team.inc index 33634d4583..73e58e36fe 100644 --- a/html/user/team.inc +++ b/html/user/team.inc @@ -121,6 +121,7 @@ function require_founder_login($user, $team) { function team_table_start() { echo " + Rank Name Members Recent average credit @@ -134,7 +135,8 @@ function show_team_row($team, $i) { $team_expavg_credit = format_credit($team->expavg_credit); $team_total_credit = format_credit($team->total_credit); echo" - $i) id>$team->name + $i + id>$team->name $team->nusers $team_expavg_credit $team_total_credit diff --git a/html/user/top_teams.php b/html/user/top_teams.php index 2d2f140c36..e586f83a3c 100644 --- a/html/user/top_teams.php +++ b/html/user/top_teams.php @@ -16,7 +16,7 @@ } $result = mysql_query("select * from team order by $sort_by"); start_table(); - row1("Teams", 5); + row1("Teams", 6); team_table_start(); $i = 1; while ($team = mysql_fetch_object($result)) { diff --git a/html/user/top_users.php b/html/user/top_users.php index f1896d9162..b44c35693f 100644 --- a/html/user/top_users.php +++ b/html/user/top_users.php @@ -1,4 +1,4 @@ -\n"; page_tail(); -?> +} ?> diff --git a/html/user/user.inc b/html/user/user.inc index 1ebf0d0a1c..76c98457f7 100644 --- a/html/user/user.inc +++ b/html/user/user.inc @@ -101,6 +101,7 @@ function user_table_start() { start_table(); echo " + Rank Name Recent average credit Total credit @@ -110,15 +111,16 @@ function user_table_start() { "; } -function show_user_row($user) { +function show_user_row($i,$user) { printf( - " + " + %d %s %s %s %s %s - \n", $user->id, $user->name, format_credit($user->expavg_credit), + \n", $i, $user->id, $user->name, format_credit($user->expavg_credit), format_credit($user->total_credit), $user->country, time_str($user->create_time)); } diff --git a/html/user/util.inc b/html/user/util.inc index dba9a484f3..cf14776c49 100644 --- a/html/user/util.inc +++ b/html/user/util.inc @@ -217,7 +217,6 @@ function random_string() { return md5(uniqid(rand())); } -// TODO: we should write this funciton in php --quarl function print_country_select($selected_country="None") { global $countries; $numCountries = count($countries); diff --git a/lib/Makefile.am b/lib/Makefile.am index 398c187078..b76927cd6b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -12,7 +12,6 @@ libboinc_a_SOURCES = \ ../api/boinc_api.C \ ../api/mfile.C \ app_ipc.C \ - countries.C \ parse.C \ xml_util.C \ filesys.C \ @@ -22,7 +21,6 @@ libboinc_a_SOURCES = \ md5_file.C \ shmem.C \ app_ipc.h \ - countries.h \ crypt.h \ error_numbers.h \ filesys.h \ diff --git a/sched/Makefile.am b/sched/Makefile.am index 87866bc2a9..20fbaad9c6 100644 --- a/sched/Makefile.am +++ b/sched/Makefile.am @@ -25,7 +25,7 @@ libsched_a_SOURCES = \ sched_config.C \ sched_messages.C \ ../db/boinc_db.C \ - ../db/db_base.C \ + ../db/db_base.C \ ../lib/util.C \ ../lib/crypt.C \ ../lib/parse.C \ @@ -76,9 +76,6 @@ db_dump_DEPENDENCIES = $(LIB_SCHED) update_stats_SOURCES = update_stats.C update_stats_DEPENDENCIES = $(LIB_SCHED) -# start_servers_SOURCES = start_servers.C -# start_servers_DEPENDENCIES = $(LIB_SCHED) - file_upload_handler_SOURCES = file_upload_handler.C file_upload_handler_DEPENDENCIES = $(LIBRSA) $(LIB_SCHED) file_upload_handler_LDADD = $(LDADD) $(RSA_LIBS) diff --git a/tools/Makefile.am b/tools/Makefile.am index cc017feb5a..d8f53206e2 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.incl -bin_PROGRAMS = create_work old_add country_select sign_executable +bin_PROGRAMS = create_work sign_executable EXTRA_DIST = make_project add update_versions dbcheck_files_exist upgrade @@ -26,22 +26,22 @@ create_work_DEPENDENCIES = $(LIBRSA) create_work_LDADD = $(RSA_LIBS) $(MYSQL_LIBS) ## deprecated -old_add_SOURCES = \ - add.C \ - backend_lib.C \ - process_result_template.C \ - ../lib/md5_file.C \ - ../lib/md5.c \ - ../lib/parse.C \ - ../lib/util.C \ - ../db/boinc_db.C \ - ../db/db_base.C \ - ../lib/crypt.C \ - ../sched/sched_config.C \ - backend_lib.h +# old_add_SOURCES = \ +# add.C \ +# backend_lib.C \ +# process_result_template.C \ +# ../lib/md5_file.C \ +# ../lib/md5.c \ +# ../lib/parse.C \ +# ../lib/util.C \ +# ../db/boinc_db.C \ +# ../db/db_base.C \ +# ../lib/crypt.C \ +# ../sched/sched_config.C \ +# backend_lib.h -old_add_DEPENDENCIES = $(LIBRSA) -old_add_LDADD = $(RSA_LIBS) $(MYSQL_LIBS) +# old_add_DEPENDENCIES = $(LIBRSA) +# old_add_LDADD = $(RSA_LIBS) $(MYSQL_LIBS) sign_executable_SOURCES = \ sign_executable.C \ @@ -51,5 +51,3 @@ sign_executable_SOURCES = \ sign_executable_DEPENDENCIES = $(LIBRSA) sign_executable_LDADD = $(RSA_LIBS) $(MYSQL_LIBS) - -country_select_SOURCES = country_select.C ../lib/countries.C