- scheduler: fix bug in assigned-job logic (from Derrick Kondo)

- client: only send active tasks in get_simple_gui_info GUI RPC


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

checkin_notes

@@ -3322,3 +3322,13 @@ David  13 Apr 2012
 
     client/
         hostinfo_network.cpp
+
+David  17 Apr 2012
+    - scheduler: fix bug in assigned-job logic (from Derrick Kondo)
+    - client: only send active tasks in get_simple_gui_info GUI RPC
+
+    sched/
+        sched_assign.cpp
+    client/
+        client_types.h
+        gui_rpc_server_ops.cpp

client/client_types.h

@@ -354,6 +354,8 @@ struct PROJECT : PROJ_AM {
         // have trickle up to send
     double last_rpc_time;
         // when last RPC finished
+        // not maintained across client sessions
+        // used by Manager (simple view)
 
     // Other stuff
 

client/gui_rpc_server_ops.cpp

@@ -116,7 +116,7 @@ static void handle_get_simple_gui_info(GUI_RPC_CONN& grc) {
         PROJECT* p = gstate.projects[i];
         p->write_state(grc.mfout, true);
     }
-    gstate.write_tasks_gui(grc.mfout, false);
+    gstate.write_tasks_gui(grc.mfout, true);
     grc.mfout.printf("</simple_gui_info>\n");
 }
 

sched/sched_assign.cpp

@@ -196,7 +196,7 @@ bool send_assigned_jobs() {
         //
         sprintf(buf, "where workunitid=%d and hostid=%d",
             asg.workunitid,
-            g_request->host.id
+            g_reply->host.id
         );
         retval = result.lookup(buf);
         if (retval != ERR_DB_NOT_FOUND) continue;