Changeset 13131

Timestamp:

2006-10-19T11:28:29+13:00 (18 years ago)

Author:

mdewsnip

Message:

Now uses the existing decode_commas function in cgiutils.

Location:

trunk/gsdl/src/recpt

Files:

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

trunk/gsdl/src/recpt/gtiaction.cpp

@@ -33 +33 @@
 #include <sys/utsname.h>
 #include "gtiaction.h"
+#include "cgiutils.h"
 #include "fileutil.h"
 #include "gsdlunicode.h"
@@ -468 +469 @@
       submission_text += &cgi_argument_name_cstr[strlen(source_chunk_key_start_cstr)];
       submission_text += "\">\n";
-      submission_text += to_utf8(xml_safe(unescape_commas(args[cgi_argument->first]))) + "\n";
+      submission_text += to_utf8(xml_safe(decode_commas(args[cgi_argument->first]))) + "\n";
       submission_text += "</SourceFileText>\n";
     }
@@ -476 +477 @@
       submission_text += &cgi_argument_name_cstr[strlen(target_chunk_key_start_cstr)];
       submission_text += "\">\n";
-      submission_text += to_utf8(xml_safe(unescape_commas(args[cgi_argument->first]))) + "\n";
+      submission_text += to_utf8(xml_safe(decode_commas(args[cgi_argument->first]))) + "\n";
       submission_text += "</TargetFileText>\n";
     }
@@ -514 +515 @@
 
   return text_string_escaped;
-}
-
-
-
-text_t gtiaction::unescape_commas(text_t text_string)
-{
-  text_t text_string_commas_unescaped = "";
-
-  text_t::iterator text_string_character = text_string.begin();
-  while (text_string_character != text_string.end()) {
-    if (*text_string_character == '%' && (text_string_character+1) != text_string.end() && *(text_string_character+1) == '2' && (text_string_character+2) != text_string.end() && *(text_string_character+2) == 'C') {
-      text_string_commas_unescaped += ",";
-      text_string_character += 2;
-    }
-    else {
-      text_string_commas_unescaped.push_back(*text_string_character);
-    }
-    text_string_character++;
-  }
-
-  return text_string_commas_unescaped;
 }
 

trunk/gsdl/src/recpt/gtiaction.h

@@ -107 +107 @@
   text_t escape_all(text_t source_string, char character_to_escape);
 
-  text_t unescape_commas(text_t source_string);
-
   text_t xml_safe(const text_t &text_string);