Changeset 10148

Timestamp:

2005-06-17T16:42:25+12:00 (19 years ago)

Author:

mdewsnip

Message:

Split up doing a GTI request into doing the request, and parsing the XML output. This is necessary for the Excel stuff (soon).

Location:

trunk/gsdl/src/recpt

Files:

• gtiaction.cpp (modified) (6 diffs)
• gtiaction.h (modified) (1 diff)

trunk/gsdl/src/recpt/gtiaction.cpp

@@ -220 +220 @@
   // Send a request to gti.pl to get the valid translation files
   text_t gti_arguments = "get-language-status " + target_language_code;
-  GTI_Response gti_response = do_gti_request(gti_arguments, logout);
+  GTI_Response gti_response = parse_gti_response(do_gti_request(gti_arguments, logout), logout);
   if (gti_response.error_message != "") {
     // An error has occurred
@@ -288 +288 @@
   logout << "Query argument: " << query_string << endl;
   text_t gti_arguments = "search-chunks " + target_language_code + " " + translation_file_key + " " + query_string;
-  GTI_Response gti_response = do_gti_request(gti_arguments, logout);
+  GTI_Response gti_response = parse_gti_response(do_gti_request(gti_arguments, logout), logout);
   if (gti_response.error_message != "") {
     // An error has occurred
@@ -348 +348 @@
   // Send a request to gti.pl to get the first string to translate
   text_t gti_arguments = "get-first-n-chunks-requiring-work " + target_language_code + " " + translation_file_key + " " + num_chunks_per_page;
-  GTI_Response gti_response = do_gti_request(gti_arguments, logout);
+  GTI_Response gti_response = parse_gti_response(do_gti_request(gti_arguments, logout), logout);
   if (gti_response.error_message != "") {
     // An error has occurred
@@ -577 +577 @@
 
 
-GTI_Response gtiaction::do_gti_request(text_t gti_arguments, ostream& logout)
-{
-  GTI_Response gti_response;
-  gti_response.is_recording_text = false;
-
+text_t gtiaction::do_gti_request(text_t gti_arguments, ostream& logout)
+{
   // Send the request to gti.pl and read the XML output
   text_t gti_command = "perl -S " + filename_cat(gsdlhome, "bin", "script", "gti.pl") + " " + gti_arguments;
@@ -589 +586 @@
   if (gti_pipe == NULL) {
     logout << "Error: Could not open pipe for GTI command " << gti_command << endl;
-    return gti_response;
+    return "";
   }
 
@@ -599 +596 @@
   }
   pclose(gti_pipe);
+
+  return gti_response_xml_text;
+}
+
+
+
+GTI_Response gtiaction::parse_gti_response(text_t gti_response_xml_text, ostream& logout)
+{
+  GTI_Response gti_response;
+  gti_response.is_recording_text = false;
 
   // Parse the gti.pl response (XML)

trunk/gsdl/src/recpt/gtiaction.h

@@ -107 +107 @@
   void process_gti_submissions(displayclass& disp, cgiargsclass& args, ostream& logout, bool force_submission);
 
-  GTI_Response do_gti_request(text_t, ostream&);
+  text_t do_gti_request(text_t gti_arguments, ostream& logout);
 
-  void do_gti_submission(text_t, text_t, ostream&);
+  GTI_Response parse_gti_response(text_t gti_response_xml_text, ostream& logout);
+
+  void do_gti_submission(text_t gti_arguments, text_t gti_submission, ostream& logout);
 };