=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/pom.xml'
--- dhis-2/dhis-services/dhis-service-dxf2/pom.xml 2015-06-23 15:59:19 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/pom.xml 2015-07-04 16:43:29 +0000
@@ -22,7 +22,7 @@
org.hisp.dhis
dhis-service-core
-
+
net.sourceforge.javacsv
javacsv
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultADXDataService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultADXDataService.java 2015-07-04 16:18:23 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultADXDataService.java 2015-07-04 16:43:29 +0000
@@ -81,7 +81,6 @@
import org.apache.xerces.util.XMLChar;
/**
- *
* @author bobj
*/
public class DefaultADXDataService
=== renamed file 'dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/CsvUtils.java' => 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/CsvUtils.java'
--- dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/CsvUtils.java 2015-06-16 17:57:23 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/CsvUtils.java 2015-07-04 16:43:29 +0000
@@ -1,4 +1,4 @@
-package org.hisp.dhis.commons.util;
+package org.hisp.dhis.importexport.dhis14.util;
/*
* Copyright (c) 2004-2015, University of Oslo
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java 2015-06-15 13:44:20 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java 2015-07-04 16:43:29 +0000
@@ -28,11 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import static org.hisp.dhis.commons.util.CsvUtils.NEWLINE;
-import static org.hisp.dhis.commons.util.CsvUtils.SEPARATOR_B;
-import static org.hisp.dhis.commons.util.CsvUtils.csvEncode;
-import static org.hisp.dhis.commons.util.CsvUtils.getCsvEndValue;
-import static org.hisp.dhis.commons.util.CsvUtils.getCsvValue;
+import static org.hisp.dhis.importexport.dhis14.util.CsvUtils.*;
import java.io.BufferedReader;
import java.io.IOException;
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueDailyConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueDailyConverter.java 2015-06-15 13:44:20 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueDailyConverter.java 2015-07-04 16:43:29 +0000
@@ -28,11 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import static org.hisp.dhis.commons.util.CsvUtils.NEWLINE;
-import static org.hisp.dhis.commons.util.CsvUtils.SEPARATOR_B;
-import static org.hisp.dhis.commons.util.CsvUtils.csvEncode;
-import static org.hisp.dhis.commons.util.CsvUtils.getCsvEndValue;
-import static org.hisp.dhis.commons.util.CsvUtils.getCsvValue;
+import static org.hisp.dhis.importexport.dhis14.util.CsvUtils.*;
import java.io.BufferedReader;
import java.io.IOException;
=== modified file 'dhis-2/dhis-support/dhis-support-system/pom.xml'
--- dhis-2/dhis-support/dhis-support-system/pom.xml 2015-06-04 22:08:39 +0000
+++ dhis-2/dhis-support/dhis-support-system/pom.xml 2015-07-04 16:43:29 +0000
@@ -197,6 +197,10 @@
junit
junit
+
+ net.sourceforge.javacsv
+ javacsv
+
../../
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java 2015-06-18 06:57:14 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java 2015-07-04 16:43:29 +0000
@@ -29,9 +29,6 @@
*/
import static org.hisp.dhis.common.DimensionalObject.DIMENSION_SEP;
-import static org.hisp.dhis.commons.util.CsvUtils.NEWLINE;
-import static org.hisp.dhis.commons.util.CsvUtils.SEPARATOR_B;
-import static org.hisp.dhis.commons.util.CsvUtils.csvEncode;
import static org.hisp.dhis.system.util.PDFUtils.addTableToDocument;
import static org.hisp.dhis.system.util.PDFUtils.closeDocument;
import static org.hisp.dhis.system.util.PDFUtils.getEmptyCell;
@@ -93,6 +90,7 @@
import org.htmlparser.tags.TableTag;
import org.springframework.jdbc.support.rowset.SqlRowSet;
+import com.csvreader.CsvWriter;
import com.lowagie.text.Document;
import com.lowagie.text.pdf.PdfPTable;
@@ -104,6 +102,7 @@
private static final Log log = LogFactory.getLog( GridUtils.class );
private static final String EMPTY = "";
+ private static final char CSV_DELIMITER = ',';
private static final String XLS_SHEET_PREFIX = "Sheet ";
private static final int JXL_MAX_COLS = 256;
@@ -334,7 +333,7 @@
/**
* Writes a CSV representation of the given Grid to the given OutputStream.
*/
- public static void toCsv( Grid grid, OutputStream out )
+ public static void toCsv( Grid grid, Writer writer )
throws Exception
{
if ( grid == null )
@@ -342,19 +341,19 @@
return;
}
+ CsvWriter csvWriter = new CsvWriter( writer, CSV_DELIMITER );
+
Iterator headers = grid.getHeaders().iterator();
- while ( headers.hasNext() )
+ if ( !grid.getHeaders().isEmpty() )
{
- out.write( csvEncode( headers.next().getColumn() ).getBytes() );
-
- if ( headers.hasNext() )
+ while ( headers.hasNext() )
{
- out.write( SEPARATOR_B );
+ csvWriter.write( headers.next().getColumn() );
}
+
+ csvWriter.endRecord();
}
-
- out.write( NEWLINE );
for ( List