Author: bleny Date: 2011-01-26 09:05:34 +0000 (Wed, 26 Jan 2011) New Revision: 945 Log: fix 'null' appearance in sampling plan export Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/test/resources/import/echantillonnage.csv Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-01-25 16:48:52 UTC (rev 944) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-01-26 09:05:34 UTC (rev 945) @@ -874,7 +874,9 @@ export.record(SAMPLING.PLAN_NB_OBSERV, numberFormat.format(row.getNbObservants())); export.record(SAMPLING.PLAN_DUREE_MOY, numberFormat.format(row.getAverageTideTime())); - export.record(SAMPLING.PLAN_COMMENT, String.valueOf(row.getComment())); + if (row.getComment() != null) { + export.record(SAMPLING.PLAN_COMMENT, String.valueOf(row.getComment())); + } export.record(SAMPLING.PLAN_STRATEGIE, row.getSamplingStrategy().name()); if (row.getTerrestrialLocation() != null) { if (row.getTerrestrialLocation().getDistrictCode() != null) { @@ -1069,7 +1071,7 @@ "Cette ligne est lié à une zone inexistante : " + districtCode); } row.addFishingZone(zone); - } + } } /** Modified: trunk/wao-business/src/test/resources/import/echantillonnage.csv =================================================================== --- trunk/wao-business/src/test/resources/import/echantillonnage.csv 2011-01-25 16:48:52 UTC (rev 944) +++ trunk/wao-business/src/test/resources/import/echantillonnage.csv 2011-01-26 09:05:34 UTC (rev 945) @@ -1,4 +1,4 @@ -"PLAN_CODE","SOCIETE_NOM","PECHE_DIVISION","PECHE_AUTRE","METIER_CODE_DCF5","METIER_MAILLAGE","METIER_TAILLE","METIER_AUTRE","METIER_LIBELLE","METIER_ESPECES","PROGRAMME_CODE","PROGRAMME_DEBUT","PROGRAMME_FIN",12/2009,01/2010,02/2010,03/2010,04/2010,05/2010,06/2010,07/2010,08/2010,09/2010,10/2010,11/2010,12/2010,01/2011,02/2011,03/2011,"PLAN_DUREE_MOY","PLAN_NB_OBSERV","PLAN_COMMENT","PLAN_STRATEGIE" +"PLAN_CODE","SOCIETE_NOM","PECHE_DIVISION","PECHE_AUTRE","METIER_CODE_DCF5","METIER_MAILLAGE","METIER_TAILLE","METIER_AUTRE","METIER_LIBELLE","METIER_ESPECES","PROGRAMME_CODE","PROGRAMME_DEBUT","PROGRAMME_FIN",12/2009,01/2010,02/2010,03/2010,04/2010,05/2010,06/2010,07/2010,08/2010,09/2010,10/2010,11/2010,12/2010,01/2011,02/2011,03/2011,"PLAN_DUREE_MOY","PLAN_NB_OBSERV","PLAN_COMMENT","PLAN_STRATEGIE","PLAN_LIEU_CODE","PLAN_LIEU_NOM" "2010_1",TARTANPION,"IId / I",,"DRB_ALG",,,,,,"MA-2009",03/2010,01/2011,,,,0,0,0,0,0,0,0,2,0,0,4,,,"1,5",1,"Un petit commentaire",SIMULTANEOUS_ALL_SPECIES "2010_2",,"IId",,"DRH_CAT et DRH_CRU",,,,"Fileyage","poissons tubes","MANY",01/2008,12/2008,,20,0,0,21,0,0,21,0,0,21,0,0,,,,1,1,, "2010_03",,"IId / IV",,"FAR",,,,"balottage en plein air","divers choses visqueuses","MA-2009",03/2010,01/2011,,,,0,22,0,0,25,0,0,21,0,0,25,,,2,1,,