Changeset 17545

Timestamp:

2008-10-15T17:21:15+13:00 (16 years ago)

Author:

mdewsnip

Message:

Moved the xml_safe() function from gtiaction into gsdltools, so it can be used by other classes.

Location:

gsdl/trunk

Files:

• common-src/src/lib/gsdltools.cpp (modified) (1 diff)
• common-src/src/lib/gsdltools.h (modified) (1 diff)
• runtime-src/src/recpt/gtiaction.cpp (modified) (1 diff)
• runtime-src/src/recpt/gtiaction.h (modified) (1 diff)

gsdl/trunk/common-src/src/lib/gsdltools.cpp

@@ -85 +85 @@
   }
 }
+
+text_t xml_safe(const text_t &text_string)
+{
+  text_t text_string_safe;
+  text_t::const_iterator here = text_string.begin();
+  text_t::const_iterator end = text_string.end();
+  while (here != end) {
+    if (*here == '&') text_string_safe += "&";
+    else if (*here == '<') text_string_safe += "&lt;";
+    else if (*here == '>') text_string_safe += "&gt;";
+    else text_string_safe.push_back(*here);
+    ++here;
+  }
+  return text_string_safe;
+}
+
 
 // gsdl_system creates a new process for the cmd command (which

gsdl/trunk/common-src/src/lib/gsdltools.h

@@ -52 +52 @@
 inline text_t dm_js_safe (const text_t &instring) {text_t outstring; dm_js_safe(instring, outstring); return outstring;}
 
+// Convert '&' to "&amp;", '<' to "&lt;", and '>' to "&gt;"
+text_t xml_safe(const text_t &text_string);
+
 // gsdl_system creates a new process for the cmd command (which
 // may contain arguments).

gsdl/trunk/runtime-src/src/recpt/gtiaction.cpp

@@ -655 +655 @@
 
 
-text_t gtiaction::xml_safe(const text_t &text_string)
-{
-  text_t text_string_safe;
-  text_t::const_iterator here = text_string.begin();
-  text_t::const_iterator end = text_string.end();
-  while (here != end) {
-    if (*here == '&') text_string_safe += "&";
-    else if (*here == '<') text_string_safe += "&lt;";
-    else if (*here == '>') text_string_safe += "&gt;";
-    else text_string_safe.push_back(*here);
-    ++here;
-  }
-
-  return text_string_safe;
-}
-
-
-
 char* xml_get_attribute(const char** attributes, char* attribute_name)
 {

gsdl/trunk/runtime-src/src/recpt/gtiaction.h

@@ -107 +107 @@
   text_t escape_all(text_t source_string, char character_to_escape);
 
-  text_t xml_safe(const text_t &text_string);
-
   void process_gti_submissions(displayclass& disp, cgiargsclass& args, ostream& logout, bool force_submission);