Author: tchemit Date: 2012-01-26 16:35:06 +0100 (Thu, 26 Jan 2012) New Revision: 295 Url: http://forge.codelutin.com/repositories/revision/echobase/295 Log: use new csv api (charset safe api) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java 2012-01-26 15:34:47 UTC (rev 294) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java 2012-01-26 15:35:06 UTC (rev 295) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.services; +import com.google.common.base.Charsets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.ExportQuery; @@ -159,7 +160,7 @@ ExportQueryCsvModel csvModel = sqlQuery.generateCsvModel(csvSeparator); Export<Map<String, Object>> exporter = Export.newExport(csvModel, rows); try { - String content = exporter.startExportAsString(); + String content = exporter.toString(Charsets.UTF_8); return content; } catch (Exception eee) { throw new EchoBaseTechnicalException("Could not export sql", eee); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-26 15:34:47 UTC (rev 294) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-26 15:35:06 UTC (rev 295) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.services; +import com.google.common.base.Charsets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.ColumnMeta; @@ -88,7 +89,7 @@ Export<TopiaEntity> export = prepareExport(tableMeta); try { - return export.startExportAsString(); + return export.toString(Charsets.UTF_8); } catch (Exception eee) { throw new EchoBaseTechnicalException("Can not export datas", eee); } @@ -104,7 +105,7 @@ TIME_LOG.log(s1, "exportDatas::prepareExport"); long s2 = TimeLog.getTime(); try { - export.exportToFile(file); + export.write(file, Charsets.UTF_8); } catch (Exception eee) { throw new EchoBaseTechnicalException("Can not export datas", eee); } @@ -122,7 +123,7 @@ long s2 = TimeLog.getTime(); try { - export.exportToFile(file); + export.write(file, Charsets.UTF_8); } catch (Exception eee) { throw new EchoBaseTechnicalException("Can not export datas", eee); }