- web: add another team stats link

- client: if ncpus is zero in cc_config.xml, honor it.


svn path=/trunk/boinc/; revision=17160

checkin_notes

@@ -1250,3 +1250,14 @@ David  5 Feb 2009
 
     html/inc/
         boinc_db.inc
+
+David  5 Feb 2009
+    - web: add another team stats link
+    - client: if ncpus is zero in cc_config.xml, honor it.
+
+    client/
+        cpu_sched.cpp
+        log_flags.cpp
+    html/inc/
+        stats_sites.inc
+        team.inc

client/cpu_sched.cpp

@@ -1174,7 +1174,7 @@ void RESULT::set_state(int val, const char* where) {
 void CLIENT_STATE::set_ncpus() {
     int ncpus_old = ncpus;
 
-    if (config.ncpus>0) {
+    if (config.ncpus>=0) {
         ncpus = config.ncpus;
     } else if (host_info.p_ncpus>0) {
         ncpus = host_info.p_ncpus;
@@ -1182,11 +1182,15 @@ void CLIENT_STATE::set_ncpus() {
         ncpus = 1;
     }
 
-    if (global_prefs.max_ncpus_pct) {
-        ncpus = (int)((ncpus * global_prefs.max_ncpus_pct)/100);
-        if (ncpus == 0) ncpus = 1;
-    } else if (global_prefs.max_ncpus && global_prefs.max_ncpus < ncpus) {
-        ncpus = global_prefs.max_ncpus;
+    // if config says no CPUs, honor it
+    //
+    if (ncpus) {
+        if (global_prefs.max_ncpus_pct) {
+            ncpus = (int)((ncpus * global_prefs.max_ncpus_pct)/100);
+            if (ncpus == 0) ncpus = 1;
+        } else if (global_prefs.max_ncpus && global_prefs.max_ncpus < ncpus) {
+            ncpus = global_prefs.max_ncpus;
+        }
     }
 
     if (initialized && ncpus != ncpus_old) {

client/log_flags.cpp

@@ -190,7 +190,7 @@ void CONFIG::defaults() {
     dont_check_file_sizes = false;
     http_1_0 = false;
     save_stats_days = 30;
-    ncpus = 0;
+    ncpus = -1;
     max_file_xfers = MAX_FILE_XFERS;
     max_file_xfers_per_project = MAX_FILE_XFERS_PER_PROJECT;
     suppress_net_info = false;

html/inc/stats_sites.inc

@@ -163,6 +163,10 @@ $team_name_sites = array(
     ),
     array("http://boincstats.com/stats/boinc_team_graph.php?pr=bo&teamcpid=",
         "BOINCstats.com",
+        "hashlc"
+    ),
+    array("http://stats.setibzh.fr/team.php?teamcpid=",
+        "SETIBZH",
         "hash"
     ),
 );

html/inc/team.inc

@@ -100,8 +100,10 @@ function display_team_page($team, $user) {
             $url = $t[0];
             $site_name = $t[1];
             $encoding = $t[2];
-            if ($encoding == "hash") {
+            if ($encoding == "hashlc") {
                 $key = md5(strtolower($team->name));
+            } else if ($encoding == 'hash') {
+                $key = md5($team->name);
             } else {
                 $key = urlencode($team->name);
             }