From 01b32db626dfa695ba7e47fd2f692846aaa1423d Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 2 Feb 2007 20:14:18 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=12027 --- checkin_notes | 33 +++++++++++++++++++++++++++++++++ client/gui_rpc_server.C | 4 +++- client/main.C | 9 +++------ clientgui/AdvancedFrame.cpp | 4 ++-- clientgui/DlgAbout.cpp | 4 ++-- db/schema.sql | 19 ++++--------------- languages/translations/en.po | 9 ++++++--- lib/network.C | 1 + py/Boinc/add_util.py | 8 -------- py/Boinc/database.py | 29 ++++++++++++++--------------- py/Boinc/db_mid.py | 5 ----- 11 files changed, 68 insertions(+), 57 deletions(-) diff --git a/checkin_notes b/checkin_notes index 483695d9ac..ecbf90bdb8 100755 --- a/checkin_notes +++ b/checkin_notes @@ -1441,6 +1441,7 @@ David 2 Feb 2007 I fixed this; the layers are now separated. Also: added new task_state value, PROCESS_QUIT_PENDING - core client: small tweak to DCF calculation + - core client: comment out stack-size stuff client/ app.C,h @@ -1450,3 +1451,35 @@ David 2 Feb 2007 cpu_sched.C languages/translations/ en.po + +David 2 Feb 2007 + - DB schema: added some "default 0"s. + Not worth putting in db_update.php + - DB schema: removed core_version table + - core client: print error messages if gethostbyname() fails + for entries in remote_hosts.cfg + - python code: updated DB table defs (not sure this matters) + - python code: removed references to core_version table (doesn't exist) + - Manager + changed "defect" to "stop using" + changed 2006 to 2007 + - core client (Unix): removed code for SIGTSTP and SIGCONT. + never got it to work, don't need anyway; + handle SIGPWR. + + client/ + gui_rpc_server.C + main.C + clientgui/ + AdvancedFrame.cpp + DlgAbout.cpp + db/ + schema.sql + languages/translations/ + en.po + lib/ + network.C + py/Boinc/ + add_util.py + database.py + db_mid.py diff --git a/client/gui_rpc_server.C b/client/gui_rpc_server.C index 13730dc48a..599df84fd9 100644 --- a/client/gui_rpc_server.C +++ b/client/gui_rpc_server.C @@ -142,7 +142,9 @@ int GUI_RPC_CONN_SET::get_allowed_hosts() { strip_whitespace(buf); if (!(buf[0] =='#' || buf[0] == ';') && strlen(buf) > 0 ) { retval = resolve_hostname(buf, ipaddr, msg); - if (!retval) { + if (retval) { + msg_printf(0, MSG_USER_ERROR, msg); + } else { allowed_remote_ip_addresses.push_back((int)ntohl(ipaddr)); } } diff --git a/client/main.C b/client/main.C index ac875225c8..cae735094f 100644 --- a/client/main.C +++ b/client/main.C @@ -257,18 +257,15 @@ static void signal_handler(int signum) { case SIGINT: case SIGQUIT: case SIGTERM: +#ifdef SIGPWR + case SIGPWR: +#endif gstate.requested_exit = true; #ifdef __EMX__ // close socket shutdown(gstate.gui_rpcs.lsock, 2); #endif break; - case SIGTSTP: - gstate.run_mode.set(RUN_MODE_NEVER, 0); - break; - case SIGCONT: - gstate.run_mode.set(RUN_MODE_AUTO, 0); - break; default: msg_printf(NULL, MSG_INTERNAL_ERROR, "Signal not handled"); } diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp index 8eae52fe65..c97bf8b555 100644 --- a/clientgui/AdvancedFrame.cpp +++ b/clientgui/AdvancedFrame.cpp @@ -1245,11 +1245,11 @@ void CAdvancedFrame::OnAccountManagerDetach(wxCommandEvent& WXUNUSED(event)) { wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str() ); strMessage.Printf( - _("If you defect from %s,\n" + _("If you stop using %s,\n" "you'll keep all your current projects,\n" "but you'll have to manage projects manually.\n" "\n" - "Do you want to defect from %s?"), + "Do you want to stop using %s?"), wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str(), wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str() ); diff --git a/clientgui/DlgAbout.cpp b/clientgui/DlgAbout.cpp index 56adbcf9ab..f8de13d7a8 100644 --- a/clientgui/DlgAbout.cpp +++ b/clientgui/DlgAbout.cpp @@ -165,7 +165,7 @@ void CDlgAbout::CreateControls() { itemFlexGridSizer7->Add(itemStaticText10, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxLEFT|wxRIGHT, 5); wxStaticText* itemStaticText11 = new wxStaticText; - itemStaticText11->Create( itemDialog1, wxID_STATIC, _("(C) 2003-2006 University of California at Berkeley.\nAll Rights Reserved."), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText11->Create( itemDialog1, wxID_STATIC, _("(C) 2003-2007 University of California at Berkeley.\nAll Rights Reserved."), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer7->Add(itemStaticText11, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); m_AboutBOINCSloganCtrl = new wxStaticText; @@ -173,7 +173,7 @@ void CDlgAbout::CreateControls() { itemBoxSizer2->Add(m_AboutBOINCSloganCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); wxStaticText* itemStaticText13 = new wxStaticText; - itemStaticText13->Create( itemDialog1, wxID_STATIC, _("A software platform for distributed computing using volunteered computer resources"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText13->Create( itemDialog1, wxID_STATIC, _("A system for volunteer computing"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer2->Add(itemStaticText13, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); m_AboutBOINCURLCtrl = new wxHyperLink; diff --git a/db/schema.sql b/db/schema.sql index 34575e0942..c375fb72a9 100644 --- a/db/schema.sql +++ b/db/schema.sql @@ -33,18 +33,7 @@ create table platform ( create_time integer not null, name varchar(254) not null, user_friendly_name varchar(254) not null, - deprecated integer not null, - primary key (id) -) type=InnoDB; - -create table core_version ( - id integer not null auto_increment, - create_time integer not null, - version_num integer not null, - platformid integer not null, - xml_doc blob, - message varchar(254), - deprecated smallint not null, + deprecated tinyint not null default 0, primary key (id) ) type=InnoDB; @@ -68,9 +57,9 @@ create table app_version ( version_num integer not null, platformid integer not null, xml_doc blob, - min_core_version integer not null, - max_core_version integer not null, - deprecated integer not null, + min_core_version integer not null default 0, + max_core_version integer not null default 0, + deprecated tinyint not null default 0, primary key (id) ) type=InnoDB; diff --git a/languages/translations/en.po b/languages/translations/en.po index 14941cbf7e..efec66e9bc 100644 --- a/languages/translations/en.po +++ b/languages/translations/en.po @@ -596,8 +596,11 @@ msgid "RLN_LINUX_AUTOSTART" msgstr "You may want to%s automatically start the core client %sat boot time." msgid "RLN_MSWIN_UNINSTALL_DESC" -msgstr "In the Start menu, select Programs / BOINC / Uninstall. " - "Or in the Start menu, select Settings / Add or remove programs." +msgstr "Select Start/Control Panel/Add or Remove Programs. " + "Select BOINC, then click Remove. " + "This removes the BOINC software only. " + "To completely remove BOINC, delete the BOINC data directory " + "(usually C:/Program Files/BOINC). " msgid "RLN_ISSUE_PROXY_NTLMAUTH" msgstr "If you use a proxy server, please hold off upgrading for now. " @@ -721,7 +724,7 @@ msgstr "If you have any questions, or need help getting started, you can " "%stalk to a Volunteer Helper%s. " msgid "HOME_MORE_INFO" -msgstr "More info" +msgstr "Running BOINC" msgid "HOME_DOWNLOAD" msgstr "Download" diff --git a/lib/network.C b/lib/network.C index a9027c729d..59275274ec 100644 --- a/lib/network.C +++ b/lib/network.C @@ -87,6 +87,7 @@ const char* socket_error_str() { } int resolve_hostname(char* hostname, int &ip_addr, char* msg) { + strcpy(msg, ""); // if the hostname is in Internet Standard dotted notation, // return that address. diff --git a/py/Boinc/add_util.py b/py/Boinc/add_util.py index a797ecda3b..5e2d9e6611 100644 --- a/py/Boinc/add_util.py +++ b/py/Boinc/add_util.py @@ -11,12 +11,6 @@ import MySQLdb CREATE_TIME = ['?create_time', int(time.time())] TRANSITION_TIME = ['?transition_time', int(time.time())] -class XCoreVersion(database.CoreVersion): - def __init__(self,**kwargs): - kwargs['xml_doc'] = tools.process_executable_file(kwargs['exec_file']) - del kwargs['exec_file'] - database.CoreVersion.__init__(self, **kwargs) - class XAppVersion(database.AppVersion): def __init__(self,**kwargs): kwargs['xml_doc'] = tools.process_app_version( @@ -41,8 +35,6 @@ class XAppVersion(database.AppVersion): list_objects_to_add = [ [ database.Platform, 'name', 'user_friendly_name', CREATE_TIME ], - [ XCoreVersion, 'platform', 'version_num', 'exec_file', - ['?message',''], ['?message_priority','']], [ database.App, 'name', 'user_friendly_name', ['?min_version',0], CREATE_TIME], [ XAppVersion, 'app', 'platform', 'version_num', 'exec_file', '?signature_file', CREATE_TIME ], diff --git a/py/Boinc/database.py b/py/Boinc/database.py index 0361756206..549cf218cc 100644 --- a/py/Boinc/database.py +++ b/py/Boinc/database.py @@ -42,16 +42,6 @@ class Platform(DatabaseObject): 'user_friendly_name', 'deprecated' ]) -class CoreVersion(DatabaseObject): - _table = DatabaseTable( - table = 'core_version', - columns = [ 'create_time', - 'version_num', - 'platformid', - 'xml_doc', - 'message', - 'deprecated' ]) - class App(DatabaseObject): _table = DatabaseTable( table = 'app', @@ -103,7 +93,10 @@ class User(DatabaseObject): 'seti_total_cpu', 'signature', 'has_profile', - 'cross_project_id' + 'cross_project_id', + 'passwd_hash', + 'email_validated', + 'donated' ]) class Team(DatabaseObject): @@ -120,7 +113,12 @@ class Team(DatabaseObject): 'nusers', 'country', 'total_credit', - 'expavg_credit' ]) + 'expavg_credit', + 'expavg_time', + 'seti_id', + 'ping_user', + 'ping_time' + ]) class Host(DatabaseObject): _table = DatabaseTable( @@ -162,7 +160,10 @@ class Host(DatabaseObject): 'venue', 'projects', 'nresults_today', - 'avg_turnaround' + 'avg_turnaround', + 'host_cpid', + 'external_ip_addr', + 'max_results_day' ]) class Workunit(DatabaseObject): @@ -272,7 +273,6 @@ def create_database(config = None, drop_first = False): connect_default_config = connect database_classes_ = [ Platform, - CoreVersion, App, AppVersion, User, @@ -282,7 +282,6 @@ database_classes_ = [ Platform, Result ] Platforms = Platform._table -CoreVersions = CoreVersion._table Apps = App._table AppVersions = AppVersion._table Users = User._table diff --git a/py/Boinc/db_mid.py b/py/Boinc/db_mid.py index 5aa1da6585..5b288e50d4 100644 --- a/py/Boinc/db_mid.py +++ b/py/Boinc/db_mid.py @@ -16,10 +16,6 @@ class front_Platform: def __repr__(self): return ''%(self.id, self.name) -class front_CoreVersion: - def __repr__(self): - return ''%(self.id, self.version_num, self.platform.name) - class front_App: def __repr__(self): return ''%(self.id, self.name) @@ -50,7 +46,6 @@ class front_Result: return ''%(self.id, self.name, self.workunit.id, self.workunit.name) MixIn(database.Platform, front_Platform) -MixIn(database.CoreVersion, front_CoreVersion) MixIn(database.App, front_App) MixIn(database.AppVersion, front_AppVersion) MixIn(database.User, front_User)