diff --git a/client/gui_rpc_client.C b/client/gui_rpc_client.C
index a68de58878..e251cc9c63 100644
--- a/client/gui_rpc_client.C
+++ b/client/gui_rpc_client.C
@@ -610,6 +610,10 @@ int RESULT::parse(MIOFILE& in) {
else if (match_tag(buf, "")) {
copy_element_contents(in, "", stderr_out);
}
+ else if (parse_int(buf, "", app_version_num)) continue;
+ else if (parse_double(buf, "", checkpoint_cpu_time)) continue;
+ else if (parse_double(buf, "", current_cpu_time)) continue;
+ else if (parse_double(buf, "", fraction_done)) continue;
}
return ERR_XML_PARSE;
}
@@ -625,23 +629,6 @@ void RESULT::print() {
printf(" signal: %d\n", signal);
printf(" active_task_state: %d\n", active_task_state);
printf(" stderr_out: %s\n", stderr_out.c_str());
-}
-
-int RESULT::parse(MIOFILE& in) {
- char buf[256];
- while (in.fgets(buf, 256)) {
- if (match_tag(buf, "")) return 0;
- else if (parse_str(buf, "", result_name)) continue;
- else if (parse_int(buf, "", app_version_num)) continue;
- else if (parse_double(buf, "", checkpoint_cpu_time)) continue;
- else if (parse_double(buf, "", current_cpu_time)) continue;
- else if (parse_double(buf, "", fraction_done)) continue;
- }
- return ERR_XML_PARSE;
-}
-
-void RESULT::print() {
- printf(" result name: %s\n", result_name.c_str());
printf(" app version num: %d\n", app_version_num);
printf(" checkpoint CPU time: %f\n", checkpoint_cpu_time);
printf(" current CPU time: %f\n", current_cpu_time);
diff --git a/client/gui_rpc_client.h b/client/gui_rpc_client.h
index c6f0c49601..4ece6a586a 100644
--- a/client/gui_rpc_client.h
+++ b/client/gui_rpc_client.h
@@ -120,22 +120,15 @@ struct RESULT {
int signal;
int active_task_state;
std::string stderr_out;
- APP* app;
- WORKUNIT* wup;
- PROJECT* project;
-
- int parse(MIOFILE&);
- void print();
-};
-
-struct RESULT {
- std::string result_name;
+ // the following define if in progress
int app_version_num;
double checkpoint_cpu_time;
double current_cpu_time;
double fraction_done;
+
+ APP* app;
+ WORKUNIT* wup;
PROJECT* project;
- RESULT* result;
int parse(MIOFILE&);
void print();