Author: kwright
Date: Sun May 15 18:03:45 2016
New Revision: 1743933
URL: http://svn.apache.org/viewvc?rev=1743933&view=rev
Log:
Fix for CONNECTORS-1315.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1743933&r1=1743932&r2=1743933&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sun May 15 18:03:45 2016
@@ -3,6 +3,9 @@ $Id$
======================= 2.5-dev =====================
+CONNECTORS-1315: Handle control characters in ES connector.
+(Silvio Meier, Karl Wright)
+
CONNECTORS-1313: Add multivalued data support to JDBC connector.
(Luca Alciata, Karl Wright)
Modified:
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java?rev=1743933&r1=1743932&r2=1743933&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java
(original)
+++
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchIndex.java
Sun May 15 18:03:45 2016
@@ -362,6 +362,10 @@ public class ElasticSearchIndex extends
sb.append('\\').append('b');
else if (x == '\f')
sb.append('\\').append('f');
+ else if (x < 32)
+ {
+ sb.append("\\u").append(String.format("%04x", (int)x));
+ }
else
{
if (x == '\"' || x == '\\' || x == '/')
