Handle non-UTF-8 input files. Fixes dkpro#29.

tfmorris · Apr 9, 2016 · 9995429 · 9995429
1 parent 712872c
commit 9995429
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/dkpro-c4corpus-boilerplate/pom.xml b/dkpro-c4corpus-boilerplate/pom.xml
@@ -49,6 +49,10 @@
 			<artifactId>commons-io</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.dkpro.c4corpus</groupId>
+			<artifactId>dkpro-c4corpus-language</artifactId>
+		</dependency>
 	</dependencies>
 
 	<!-- for a standalone application -->

diff --git a/...java/de/tudarmstadt/ukp/dkpro/c4corpus/boilerplate/standalone/HTMLBoilerplateRemoval.java b/...java/de/tudarmstadt/ukp/dkpro/c4corpus/boilerplate/standalone/HTMLBoilerplateRemoval.java
@@ -19,11 +19,15 @@
 
 import de.tudarmstadt.ukp.dkpro.c4corpus.boilerplate.BoilerPlateRemoval;
 import de.tudarmstadt.ukp.dkpro.c4corpus.boilerplate.impl.JusTextBoilerplateRemoval;
+import de.tudarmstadt.ukp.dkpro.c4corpus.hadoop.CharsetDetector;
+import de.tudarmstadt.ukp.dkpro.c4corpus.hadoop.impl.ICUCharsetDetectorWrapper;
+
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.nio.charset.Charset;
 
 /**
  * This class takes one HTML file as input, removes boilerplate for each entry,
@@ -36,10 +40,14 @@
 public class HTMLBoilerplateRemoval
 {
     private static final BoilerPlateRemoval boilerPlateRemoval = new JusTextBoilerplateRemoval();
+    private final static CharsetDetector CHARSET_DETECTOR = new ICUCharsetDetectorWrapper();
 
     public static void main(String[] args)
             throws IOException
     {
+        if (args.length < 3) {
+            System.out.println("Not enough arguments - Usage: infile outfile true/false (output HTML tags)");
+        }
         File input = new File(args[0]);
         File output = new File(args[1]);
         boolean keepMinimalHtml = Boolean.valueOf(args[2]);
@@ -51,7 +59,9 @@ public static void processHtmlFile(File input, File outFile, boolean keepMinimal
             throws IOException
     {
         // read the html file
-        String html = FileUtils.readFileToString(input, "utf-8");
+        byte[] bytes = FileUtils.readFileToByteArray(input);
+        Charset charset = CHARSET_DETECTOR.detectCharset(bytes);
+        String html = new String(bytes, charset);
 
         // boilerplate removal
         String cleanText;