diff --git a/checkin_notes b/checkin_notes index b6760819c9..1e619005c2 100755 --- a/checkin_notes +++ b/checkin_notes @@ -18577,3 +18577,13 @@ David 19 Oct 2004 api/ graphics_api.C x_opengl.C + +David 19 Oct 2004 + - GUI RPC: the get_results and get_file_transfers RPC + weren't returning the project_url. + Do this, and parse it on the client side. + + client/ + client_types.C + lib/ + gui_rpc_client.C,h diff --git a/client/client_types.C b/client/client_types.C index 7ecbd6432c..a200985c42 100644 --- a/client/client_types.C +++ b/client/client_types.C @@ -627,7 +627,11 @@ int FILE_INFO::write_gui(MIOFILE& out) { " %f\n" " %f\n", " %d\n", - project->master_url, name, nbytes, max_nbytes, status + project->master_url, + name, + nbytes, + max_nbytes, + status ); if (generated_locally) out.printf(" \n"); if (uploaded) out.printf(" \n"); @@ -1182,22 +1186,22 @@ int RESULT::write_gui(MIOFILE& out) { out.printf( "\n" " %s\n" + " %s\n" + " %s\n" " %f\n" " %d\n" - " %d\n", + " %d\n" + " %d\n", name, + wu_name, + project->master_url, final_cpu_time, exit_status, - state + state, + report_deadline ); if (got_server_ack) out.printf(" \n"); if (ready_to_report) out.printf(" \n"); - out.printf( - " %s\n" - " %d\n", - wu_name, - report_deadline - ); ACTIVE_TASK* atp = gstate.active_tasks.lookup_result(this); if (atp) { atp->write(out); diff --git a/lib/gui_rpc_client.C b/lib/gui_rpc_client.C index aab6693362..3336b0f705 100644 --- a/lib/gui_rpc_client.C +++ b/lib/gui_rpc_client.C @@ -283,6 +283,7 @@ int RESULT::parse(MIOFILE& in) { if (match_tag(buf, "")) return 0; else if (parse_str(buf, "", name)) continue; else if (parse_str(buf, "", wu_name)) continue; + else if (parse_str(buf, "", project_url)) continue; else if (parse_int(buf, "", report_deadline)) continue; else if (match_tag(buf, "")) { ready_to_report = true; @@ -363,6 +364,7 @@ int FILE_TRANSFER::parse(MIOFILE& in) { while (in.fgets(buf, 256)) { if (match_tag(buf, "")) return 0; else if (parse_str(buf, "", name)) continue; + else if (parse_str(buf, "", project_url)) continue; else if (match_tag(buf, "")) { generated_locally = true; continue; diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h index 045d01f1f2..d099ae3198 100644 --- a/lib/gui_rpc_client.h +++ b/lib/gui_rpc_client.h @@ -125,6 +125,7 @@ class RESULT { public: std::string name; std::string wu_name; + std::string project_url; int report_deadline; bool ready_to_report; bool got_server_ack; @@ -157,6 +158,7 @@ public: class FILE_TRANSFER { public: std::string name; + std::string project_url; bool generated_locally; bool uploaded; bool upload_when_present;