Author: bleny Date: 2011-01-03 15:41:23 +0000 (Mon, 03 Jan 2011) New Revision: 877 Log: bugfix export csv Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2011-01-03 15:37:15 UTC (rev 876) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2011-01-03 15:41:23 UTC (rev 877) @@ -394,8 +394,9 @@ } public static int getTotalHeaders() { - // CONT_DATA_RELIABILITY is the last column - return CONT_DATA_RELIABILITY.forContactCsv() + 1; + // FIXME 2011-01-03 bleny should be dynamic + // CONT_COMPLETE_SAMPLING is the last column + return CONT_COMPLETE_SAMPLING.forContactCsv() + 1; } public static String formatValidation(Boolean validation) { Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2011-01-03 15:37:15 UTC (rev 876) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2011-01-03 15:41:23 UTC (rev 877) @@ -26,7 +26,6 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.ContactFilterImpl; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStatus.NullSampleMonthException; import fr.ifremer.wao.bean.SamplingStrategy; @@ -48,7 +47,6 @@ import fr.ifremer.wao.io.csv.WaoCsvHeader.BOAT; import fr.ifremer.wao.io.csv.WaoCsvHeader.CONTACT; import fr.ifremer.wao.io.csv.WaoCsvHeader.SAMPLING; -import org.apache.commons.io.IOUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass;