Author: tchemit Date: 2014-04-17 12:48:02 +0200 (Thu, 17 Apr 2014) New Revision: 1692 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1692 Log: fixes #4945 Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-04-17 10:31:12 UTC (rev 1691) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-04-17 10:48:02 UTC (rev 1692) @@ -93,18 +93,12 @@ protected WeightComputingService weightComputingService; - protected char csvSeparator; - protected Caracteristic verticalOpeningCaracteristic; protected Caracteristic horizontalOpeningWingCaracteristic; protected Caracteristic horizontalOpeningDoorCaracteristic; - protected TuttiLocation country; - - protected SampleCategoryModel sampleCategoryModel; - protected Caracteristic deadOrAliveCaracteristic; protected Caracteristic genderCaracteristic; @@ -120,9 +114,6 @@ decoratorService = getService(DecoratorService.class); weightComputingService = getService(WeightComputingService.class); - sampleCategoryModel = context.getSampleCategoryModel(); - - csvSeparator = context.getConfig().getCsvSeparator(); verticalOpeningCaracteristic = persistenceService.getVerticalOpeningCaracteristic(); horizontalOpeningWingCaracteristic = persistenceService.getHorizontalOpeningWingCaracteristic(); horizontalOpeningDoorCaracteristic = persistenceService.getHorizontalOpeningDoorCaracteristic(); @@ -130,10 +121,6 @@ pmfmIdCaracteristic = persistenceService.getPmfmIdCaracteristic(); deadOrAliveCaracteristic = persistenceService.getDeadOrAliveCaracteristic(); genderCaracteristic = persistenceService.getSexCaracteristic(); - - List<TuttiLocation> allCountry = persistenceService.getAllCountry(); - String countryId = context.getConfig().getExportCountryId(); - country = TuttiEntities.splitById(allCountry).get(countryId); } public void exportProgram(String programId, @@ -302,6 +289,8 @@ List<Species> allReferentSpecies = persistenceService.getAllReferentSpecies(); Map<String, Species> speciesById = TuttiEntities.splitById(allReferentSpecies); + char csvSeparator = context.getConfig().getCsvSeparator(); + return new ExportContext( basedir, csvSeparator, @@ -310,7 +299,7 @@ deadOrAliveCaracteristic, genderCaracteristic, pmfmIdCaracteristic, - sampleCategoryModel, + context.getSampleCategoryModel(), speciesById); } @@ -420,6 +409,11 @@ protected void exportSurvey(ExportContext exportContext, Cruise cruise) { + + List<TuttiLocation> allCountry = persistenceService.getAllCountry(); + String countryId = context.getConfig().getExportCountryId(); + TuttiLocation country = TuttiEntities.splitById(allCountry).get(countryId); + try { List<SurveyExportRow> rows = Lists.newArrayList(); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-04-17 10:31:12 UTC (rev 1691) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-04-17 10:48:02 UTC (rev 1692) @@ -32,8 +32,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.TreeMultimap; import com.google.common.io.Files; -import org.nuiton.jaxx.application.ApplicationTechnicalException; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; @@ -51,6 +49,7 @@ import org.nuiton.csv.Export; import org.nuiton.csv.Import; import org.nuiton.csv.ImportRuntimeException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -76,15 +75,12 @@ private static final Log log = LogFactory.getLog(ProtocolImportExportService.class); - protected SampleCategoryModel sampleCategoryModel; - protected TuttiEnumerationFile enumerationFile; @Override public void setServiceContext(TuttiServiceContext context) { super.setServiceContext(context); PersistenceService service = getService(PersistenceService.class); - sampleCategoryModel = context.getDataContext().getSampleCategoryModel(); enumerationFile = service.getEnumerationFile(); } @@ -141,19 +137,23 @@ protocol.setLengthClassesPmfmId( mergeIds(protocol.getLengthClassesPmfmId(), - ids.get(CaracteristicType.LENGTH_STEP))); + ids.get(CaracteristicType.LENGTH_STEP)) + ); protocol.setVesselUseFeaturePmfmId( mergeIds(protocol.getVesselUseFeaturePmfmId(), - ids.get(CaracteristicType.VESSEL_USE_FEATURE))); + ids.get(CaracteristicType.VESSEL_USE_FEATURE)) + ); protocol.setGearUseFeaturePmfmId( mergeIds(protocol.getGearUseFeaturePmfmId(), - ids.get(CaracteristicType.GEAR_USE_FEATURE))); + ids.get(CaracteristicType.GEAR_USE_FEATURE)) + ); protocol.setIndividualObservationPmfmId( mergeIds(protocol.getIndividualObservationPmfmId(), - ids.get(CaracteristicType.INDIVIDUAL_OBSERVATION))); + ids.get(CaracteristicType.INDIVIDUAL_OBSERVATION)) + ); }