Merge pull request #7092 from BOINC/dpa_boinccmd

boinccmd: make --get_state and --get_simple_gui_info show same task info

Author: AenBleidd

lib/gui_rpc_client_ops.cpp

@@ -1595,16 +1595,24 @@ int RPC_CLIENT::get_simple_gui_info(SIMPLE_GUI_INFO& info) {
     retval = rpc.do_rpc("<get_simple_gui_info/>\n");
     if (!retval) {
         while (rpc.fin.fgets(buf, 256)) {
-            if (match_tag(buf, "</simple_gui_info>")) break;
-            else if (match_tag(buf, "<project>")) {
+            if (match_tag(buf, "</simple_gui_info>")) {
+                break;
+            }
+            if (match_tag(buf, "<project>")) {
                 PROJECT* project = new PROJECT();
                 project->parse(rpc.xp);
                 info.projects.push_back(project);
                 continue;
             }
-            else if (match_tag(buf, "<result>")) {
+            if (match_tag(buf, "<result>")) {
                 RESULT* result = new RESULT();
                 result->parse(rpc.xp);
+                for (PROJECT *p: info.projects) {
+                    if (!strcmp(p->master_url, result->project_url)) {
+                        result->project = p;
+                        break;
+                    }
+                }
                 info.results.push_back(result);
                 continue;
             }

lib/gui_rpc_client_print.cpp

@@ -150,9 +150,8 @@ void RESULT::print() {
     printf("   WU name: %s\n", wu_name);
     if (project) {
         printf("   project: %s\n", project->project_name.c_str());
-    } else {
-        printf("   project URL: %s\n", project_url);
     }
+    printf("   project URL: %s\n", project_url);
     time_t foo = (time_t)received_time;
     printf("   received: %s", ctime(&foo));
     foo = (time_t)report_deadline;