Skip to content
Snippets Groups Projects
Commit 3bfcb466 authored by Sascha Steinbiss's avatar Sascha Steinbiss
Browse files

Merge pull request #210 from satta/embl_escape

extend escaping in qualifier values
parents 5660579c 2d0174a7
No related branches found
No related tags found
No related merge requests found
...@@ -106,10 +106,14 @@ class StreamQualifier { ...@@ -106,10 +106,14 @@ class StreamQualifier {
buffer.append ('/'); buffer.append ('/');
buffer.append (qualifier.getName ()); buffer.append (qualifier.getName ());
if (values.elementAt (i) != null) { if (values.elementAt (i) != null) {
/* Escape double quotes */
String processedValue = (String)values.elementAt (i).replaceAll("(^|[^\"])\"([^\"]|$)","$1\"\"$2");
/* Mask line breaks in entries (e.g. notes/history) */
processedValue = processedValue.replaceAll("\n", " ");
buffer.append ('='); buffer.append ('=');
buffer.append (quotedValue (qualifier_info, buffer.append (quotedValue(qualifier_info,
qualifier.getName (), qualifier.getName(),
(String)values.elementAt (i))); processedValue));
} }
} }
...@@ -140,10 +144,14 @@ class StreamQualifier { ...@@ -140,10 +144,14 @@ class StreamQualifier {
buffer.append ('/'); buffer.append ('/');
buffer.append (qualifier.getName ()); buffer.append (qualifier.getName ());
if (values.elementAt (i) != null) { if (values.elementAt (i) != null) {
/* Escape double quotes */
String processedValue = (String)values.elementAt (i).replaceAll("(^|[^\"])\"([^\"]|$)","$1\"\"$2");
/* Mask line breaks in entries (e.g. notes/history) */
processedValue = processedValue.replaceAll("\n", " ");
buffer.append ('='); buffer.append ('=');
buffer.append (quotedValue (qualifier_info, buffer.append (quotedValue (qualifier_info,
qualifier.getName (), qualifier.getName (),
(String)values.elementAt (i))); processedValue));
} }
return_vector.add (buffer.toString ()); return_vector.add (buffer.toString ());
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment