Author: tchemit Date: 2012-09-18 10:50:31 +0200 (Tue, 18 Sep 2012) New Revision: 673 Url: http://forge.codelutin.com/repositories/revision/echobase/673 Log: czn use gz files for echobase distribution files Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java 2012-09-18 08:42:47 UTC (rev 672) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java 2012-09-18 08:50:31 UTC (rev 673) @@ -22,6 +22,7 @@ */ package fr.ifremer.echobase.io; +import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import fr.ifremer.echobase.EchoBaseTechnicalException; import org.apache.commons.collections.CollectionUtils; @@ -34,13 +35,14 @@ import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; -import java.io.FileReader; +import java.io.FileInputStream; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.LineNumberReader; import java.util.Collection; +import java.util.zip.GZIPInputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -95,7 +97,12 @@ try { boolean firstLine = false; for (File toMergeFile : fileToMerges) { - BufferedReader reader = new BufferedReader(new FileReader(toMergeFile)); + BufferedReader reader; + if (toMergeFile.getName().endsWith(".gz")) { + reader = new BufferedReader(new InputStreamReader(new GZIPInputStream(new FileInputStream(toMergeFile)), Charsets.UTF_8)); + } else { + reader = new BufferedReader(new InputStreamReader(new FileInputStream(toMergeFile), Charsets.UTF_8)); + } try { // pass the first line (header) String line = reader.readLine();