Changeset 10092

Timestamp:

2005-06-14T15:05:33+12:00 (19 years ago)

Author:

mdewsnip

Message:

Now escapes backslash characters also, in response to changes to gti.pl.

File:

• trunk/gsdl/src/recpt/gtiaction.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/gtiaction.cpp

@@ -299 +299 @@
     text_t chunk_key_escaped = escape_all(chunk_key, '_');
 
-    // Need to escape any underscores, commas, parentheses and single quotes in the chunk text
+    // Need to escape any backslashes, underscores, commas, parentheses, and single quotes in the chunk text
     text_t target_file_chunk_text = gti_response.target_file_chunks_key_to_text_mapping[chunk_key];
-    text_t target_file_chunk_text_escaped = escape_all(target_file_chunk_text, '_');
+    text_t target_file_chunk_text_escaped = escape_all(target_file_chunk_text, '\\');
+    target_file_chunk_text_escaped = escape_all(target_file_chunk_text_escaped, '_');
     target_file_chunk_text_escaped = escape_all(target_file_chunk_text_escaped, ',');
     target_file_chunk_text_escaped = escape_all(target_file_chunk_text_escaped, '(');
@@ -364 +365 @@
     text_t chunk_key_escaped = escape_all(chunk_key, '_');
 
-    // Need to escape any underscores, commas, parentheses and single quotes in the chunk text
+    // Need to escape any backslashes, underscores, commas, parentheses, and single quotes in the chunk text
     text_t source_file_chunk_text = gti_response.source_file_chunks_key_to_text_mapping[chunk_key];
-    text_t source_file_chunk_text_escaped = escape_all(source_file_chunk_text, '_');
+    text_t source_file_chunk_text_escaped = escape_all(source_file_chunk_text, '\\');
+    source_file_chunk_text_escaped = escape_all(source_file_chunk_text_escaped, '_');
     source_file_chunk_text_escaped = escape_all(source_file_chunk_text_escaped, ',');
     source_file_chunk_text_escaped = escape_all(source_file_chunk_text_escaped, '(');
@@ -372 +374 @@
     source_file_chunk_text_escaped = escape_all(source_file_chunk_text_escaped, '\'');
     text_t target_file_chunk_text = gti_response.target_file_chunks_key_to_text_mapping[chunk_key];
-    text_t target_file_chunk_text_escaped = escape_all(target_file_chunk_text, '_');
+    text_t target_file_chunk_text_escaped = escape_all(target_file_chunk_text, '\\');
+    target_file_chunk_text_escaped = escape_all(target_file_chunk_text_escaped, '_');
     target_file_chunk_text_escaped = escape_all(target_file_chunk_text_escaped, ',');
     target_file_chunk_text_escaped = escape_all(target_file_chunk_text_escaped, '(');