From dd2bb6d4ba65ca3e75a77d40a8699b28a1ced46f Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 2 Sep 2009 15:18:15 +0000
Subject: [PATCH] - scheduler: put client version in host.serialnum - web:
 parse serialnum correctly

svn path=/trunk/boinc/; revision=18986
---
 checkin_notes            |  9 +++++++++
 html/inc/host.inc        |  7 ++++++-
 sched/handle_request.cpp | 10 +++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index aa11c68240..1233ad29a7 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7440,3 +7440,12 @@ Charlie 1 Sept 2009
         Mac_SA_Secure.sh
     mac_installer/
         PostInstall.cpp
+
+David  2 Sept 2009
+    - scheduler: put client version in host.serialnum
+    - web: parse serialnum correctly
+
+    html/inc/
+        host.inc
+    sched/
+        handle_request.cpp
diff --git a/html/inc/host.inc b/html/inc/host.inc
index 3e6d6f1909..4bcc5f1485 100644
--- a/html/inc/host.inc
+++ b/html/inc/host.inc
@@ -230,10 +230,15 @@ function host_nresults($host) {
     return BoincResult::count("hostid=$host->id");
 }
 
-// format a GPU description string of the form [type|model|number|RAM]
+// format a GPU description string of the form [BOINC|vers][type|model|number|RAM]
 //
 function gpu_desc($x) {
     if (!$x) return "";
+    // skip BOINC part
+    $y = strstr($x, 'BOINC');
+    if ($y) {
+        $x = strstr($y, "[");
+    }
     $x = substr($x, 1, -1);
     $y = explode("|", $x);
     $z = "";
diff --git a/sched/handle_request.cpp b/sched/handle_request.cpp
index b5c848332d..0764b800c7 100644
--- a/sched/handle_request.cpp
+++ b/sched/handle_request.cpp
@@ -490,7 +490,15 @@ got_host:
 static int modify_host_struct(HOST& host) {
     host.timezone = g_request->host.timezone;
     strncpy(host.domain_name, g_request->host.domain_name, sizeof(host.domain_name));
-    g_request->coprocs.summary_string(host.serialnum, sizeof(host.serialnum));
+    char buf[256], buf2[256];
+    sprintf(buf, "[BOINC|%d.%d.%d]",
+        g_request->core_client_major_version,
+        g_request->core_client_minor_version,
+        g_request->core_client_release
+    );
+    g_request->coprocs.summary_string(buf2, sizeof(buf2));
+    strlcpy(host.serialnum, buf, sizeof(host.serialnum));
+    strlcat(host.serialnum, buf2, sizeof(host.serialnum));
     if (strcmp(host.last_ip_addr, g_request->host.last_ip_addr)) {
         strncpy(host.last_ip_addr, g_request->host.last_ip_addr, sizeof(host.last_ip_addr));
     } else {