From 5b015af00fd9c10d42f4d47d5cca973d6e0dd16b Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 1 Feb 2005 20:30:33 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=5264
---
 checkin_notes        | 21 ++++++++++++++-------
 sched/server_types.C | 24 ++++++++++++++++++++----
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index d71ba587c5..b2524d4ed5 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -23678,15 +23678,16 @@ Rom    31 Jan 2005
         BOINCGUI.vcproj
 
 Rom    31 Jan 2005
-    - Move the SetCurrentDirectory call to boinc_init() from service_main() which was
-      causing the log files to be put into the system32 directory. Fixes start as service
-      setup case.
+    - Move the SetCurrentDirectory call to boinc_init() from service_main()
+        which was causing the log files to be put into the system32 directory.
+        Fixes start as service setup case.
     - Flush stderr as well as stdout in boinc_init()
     - Remove needless calls to PostMessage from check_unique_instance()
-    - Adjust BOINC Manager so that it can properly detect if it can open a connection
-      to the core client so that it can determine if it needs to start it.  Fixes single
-      user setup case.  Should I make a complete API call in case another application
-      has port 1043 open?
+    - Adjust BOINC Manager so that it can properly detect if it can open
+        a connection to the core client so that it can determine
+        if it needs to start it.  Fixes single user setup case.
+        Should I make a complete API call in case another application
+        has port 1043 open?
     - Cleanup exception.C out of the core client project.
 
     client/
@@ -23699,3 +23700,9 @@ Rom    31 Jan 2005
         MainDocument.cpp, .h
     win_build/
         boinc_cli.vcproj
+
+David  1 Feb 2005
+    - scheduling server: if host is 4.62 or earlier, concatenate messages
+
+    sched/
+        server_types.C
diff --git a/sched/server_types.C b/sched/server_types.C
index fd4245681c..cd68f26523 100644
--- a/sched/server_types.C
+++ b/sched/server_types.C
@@ -332,13 +332,29 @@ int SCHEDULER_REPLY::write(FILE* fout) {
         fprintf(fout, "<request_delay>%d</request_delay>\n", request_delay);
         log_messages.printf(SCHED_MSG_LOG::NORMAL, "sending delay request %d\n", request_delay);
     }
-    for (i=0; i<messages.size(); i++) {
-        USER_MESSAGE& um = messages[i];
+    if (wreq.core_client_version < 462) {
+        std::string msg;
+        std::string pri = "low";
+        for (i=0; i<messages.size(); i++) {
+            USER_MESSAGE& um = messages[i];
+            msg += um.message + std::string(" ");
+            if (um.priority == "high") {
+                pri = "high";
+            }
+        }
         fprintf(fout,
             "<message priority=\"%s\">%s</message>\n",
-            um.priority.c_str(),
-            um.message.c_str()
+            msg.c_str(), pri.c_str()
         );
+    } else {
+        for (i=0; i<messages.size(); i++) {
+            USER_MESSAGE& um = messages[i];
+            fprintf(fout,
+                "<message priority=\"%s\">%s</message>\n",
+                um.priority.c_str(),
+                um.message.c_str()
+            );
+        }
     }
     if (nucleus_only) goto end;