svn commit: r1552584 - in /uima/ruta/trunk: ruta-core/src/main/java/org/apache/uima/ruta/engine/HtmlConverter.java ruta-core/src/main/resources/org/apache/uima/ruta/engine/HtmlConverter.xml ruta-docbook/src/docbook/tools.ruta.overview.xml

[pk...@apache.org]

Author: pkluegl
Date: Fri Dec 20 10:29:30 2013
New Revision: 1552584

URL: http://svn.apache.org/r1552584
Log:
UIMA-3512
- applied both patches

Modified:
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/HtmlConverter.java
    uima/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/HtmlConverter.xml
    uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/HtmlConverter.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/HtmlConverter.java?rev=1552584&r1=1552583&r2=1552584&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/HtmlConverter.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/HtmlConverter.java Fri Dec 20 10:29:30 2013
@@ -71,6 +71,8 @@ public class HtmlConverter extends JCasA
 
   public static final String REPLACE_LINEBREAKS = "replaceLinebreaks";
 
+  public static final String LINEBREAK_REPLACEMENT = "linebreakReplacement";
+  
   public static final String LINEBREAK = "\n";
 
   public static final String NEWLINE_INDUCING_TAGS = "newlineInducingTags";
@@ -96,6 +98,8 @@ public class HtmlConverter extends JCasA
   private String[] conversionReplacements;
 
   private Boolean replaceLinebreaks;
+  
+  private String linebreakReplacement;
 
   enum StringConversionPolicy {
     HEURISTIC, EXPLICIT, NONE
@@ -115,6 +119,8 @@ public class HtmlConverter extends JCasA
             : modifiedViewName;
     replaceLinebreaks = (Boolean) aContext.getConfigParameterValue(REPLACE_LINEBREAKS);
     replaceLinebreaks = replaceLinebreaks == null ? true : replaceLinebreaks;
+    linebreakReplacement = (String) aContext.getConfigParameterValue(LINEBREAK_REPLACEMENT);
+    linebreakReplacement = linebreakReplacement == null ? "" : linebreakReplacement;
     String conversionPolicyString = (String) aContext.getConfigParameterValue(CONVERSION_POLICY);
     conversionPolicyString = conversionPolicyString == null ? null : conversionPolicyString
             .toLowerCase();
@@ -325,7 +331,7 @@ public class HtmlConverter extends JCasA
 
   private SortedSet<HtmlConverterPSpan> handleLinebreaksInDocumentText(
           SortedSet<HtmlConverterPSpan> visibleSpansSoFar, String splitSeq) {
-    return this.handleConversion(visibleSpansSoFar, splitSeq, "");
+    return this.handleConversion(visibleSpansSoFar, splitSeq, linebreakReplacement);
   }
 
   private SortedSet<HtmlConverterPSpan> htmlDecoding(SortedSet<HtmlConverterPSpan> visibleSpansSoFar) {

Modified: uima/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/HtmlConverter.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/HtmlConverter.xml?rev=1552584&r1=1552583&r2=1552584&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/HtmlConverter.xml (original)
+++ uima/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/HtmlConverter.xml Fri Dec 20 10:29:30 2013
@@ -46,6 +46,12 @@
         <mandatory>false</mandatory>
       </configurationParameter>
       <configurationParameter>
+        <name>linebreakReplacement</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
         <name>inputView</name>
         <type>String</type>
         <multiValued>false</multiValued>

Modified: uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml?rev=1552584&r1=1552583&r2=1552584&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml (original)
+++ uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml Fri Dec 20 10:29:30 2013
@@ -1257,6 +1257,13 @@ ae.process(cas);]]></programlisting>
             The default behaviour is <quote>true</quote>.
           </para>
         </section>
+        <section id="ugr.tools.ruta.ae.htmlconverter.parameter.linebreakReplacement">
+          <title>replaceLinebreaks</title>
+          <para>
+            This string parameter determines the character sequence that replaces a linebreak.
+            The default behaviour is the empty string.
+          </para>
+        </section>
         <section id="ugr.tools.ruta.ae.htmlconverter.parameter.conversionPolicy">
           <title>conversionPolicy</title>
           <para>