*** empty log message ***

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

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

client/client_types.C

@@ -627,7 +627,11 @@ int FILE_INFO::write_gui(MIOFILE& out) {
         "    <nbytes>%f</nbytes>\n"
         "    <max_nbytes>%f</max_nbytes>\n",
         "    <status>%d</status>\n",
-		project->master_url, name, nbytes, max_nbytes, status
+		project->master_url,
+        name,
+        nbytes,
+        max_nbytes,
+        status
     );
     if (generated_locally) out.printf("    <generated_locally/>\n");
     if (uploaded) out.printf("    <uploaded/>\n");
@@ -1182,22 +1186,22 @@ int RESULT::write_gui(MIOFILE& out) {
     out.printf(
         "<result>\n"
         "    <name>%s</name>\n"
+        "    <wu_name>%s</wu_name>\n"
+        "    <project_url>%s</project_url>\n"
         "    <final_cpu_time>%f</final_cpu_time>\n"
         "    <exit_status>%d</exit_status>\n"
-        "    <state>%d</state>\n",
+        "    <state>%d</state>\n"
+        "    <report_deadline>%d</report_deadline>\n",
         name,
+        wu_name,
+        project->master_url,
         final_cpu_time,
         exit_status,
-        state
+        state,
+        report_deadline
     );
     if (got_server_ack) out.printf("    <got_server_ack/>\n");
     if (ready_to_report) out.printf("    <ready_to_report/>\n");
-    out.printf(
-        "    <wu_name>%s</wu_name>\n"
-        "    <report_deadline>%d</report_deadline>\n",
-        wu_name,
-        report_deadline
-    );
     ACTIVE_TASK* atp = gstate.active_tasks.lookup_result(this);
     if (atp) {
         atp->write(out);

lib/gui_rpc_client.C

@@ -283,6 +283,7 @@ int RESULT::parse(MIOFILE& in) {
         if (match_tag(buf, "</result>")) return 0;
         else if (parse_str(buf, "<name>", name)) continue;
         else if (parse_str(buf, "<wu_name>", wu_name)) continue;
+        else if (parse_str(buf, "<project_url>", project_url)) continue;
         else if (parse_int(buf, "<report_deadline>", report_deadline)) continue;
         else if (match_tag(buf, "<ready_to_report/>")) {
             ready_to_report = true;
@@ -363,6 +364,7 @@ int FILE_TRANSFER::parse(MIOFILE& in) {
     while (in.fgets(buf, 256)) {
         if (match_tag(buf, "</file_transfer>")) return 0;
         else if (parse_str(buf, "<name>", name)) continue;
+        else if (parse_str(buf, "<project_url>", project_url)) continue;
         else if (match_tag(buf, "<generated_locally/>")) {
             generated_locally = true;
             continue;

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;