This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit acb35e6b2e07387910eaf99c8ff7d5ebc9031d70 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 19:29:32 2015 +0100 add failfast option when loading files + show inmport configuration for report generation --- .../genericformat/GenericFormatImportContext.java | 109 ++++++++++++++++----- .../genericformat/GenericFormatImportRequest.java | 4 + 2 files changed, 87 insertions(+), 26 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportContext.java index 1e8f306..ee74be5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportContext.java @@ -70,6 +70,22 @@ public class GenericFormatImportContext implements Closeable { private final Map<String, GenericFormatImportCruiseContext> cruiseContexts; + private final GenericFormatFileResult surveyFileResult; + + private final GenericFormatFileResult accidentalCatchFileResult; + + private final GenericFormatFileResult individualObservationFileResult; + + private final GenericFormatFileResult marineLitterFileResult; + + private final GenericFormatFileResult catchFileResult; + + private final GenericFormatFileResult parameterFileResult; + + private final GenericFormatFileResult operationFileResult; + + private final GenericFormatFileResult gearCaracteristicFileResult; + public GenericFormatImportContext(GenericFormatImportRequest importRequest, ProgressionModel progressionModel, PersistenceService persistenceService, @@ -90,6 +106,15 @@ public class GenericFormatImportContext implements Closeable { this.validationHelper = new GenericFormatImportValidationHelper(this, new ValidationService()); this.cruiseContexts = new LinkedHashMap<>(); + this.surveyFileResult = new GenericFormatFileResult("survey.csv", importRequest.getArchive().getSurveyLineCount(), null); + this.gearCaracteristicFileResult = new GenericFormatFileResult("sgearCaracteristics.csv", importRequest.getArchive().getGearCaracteristicsPathLineCount(), null); + this.operationFileResult = new GenericFormatFileResult("operation.csv", importRequest.getArchive().getOperationPathLineCount(), null); + this.parameterFileResult = new GenericFormatFileResult("parameter.csv", importRequest.getArchive().getParameterPathLineCount(), null); + this.catchFileResult = new GenericFormatFileResult("catch.csv", importRequest.getArchive().getCatchPathLineCount(), null); + this.marineLitterFileResult = new GenericFormatFileResult("marineLitter.csv", importRequest.getArchive().getMarineLitterPathLineCount(), null); + this.individualObservationFileResult = new GenericFormatFileResult("individualObservation.csv", importRequest.getArchive().getIndividualObservationPathLineCount(), null); + this.accidentalCatchFileResult = new GenericFormatFileResult("accidentalCatch.csv", importRequest.getArchive().getAccidentalCatchPathLineCount(), null); + } @Override @@ -104,6 +129,38 @@ public class GenericFormatImportContext implements Closeable { } + public GenericFormatFileResult getSurveyFileResult() { + return surveyFileResult; + } + + public GenericFormatFileResult getGearCaracteristicFileResult() { + return gearCaracteristicFileResult; + } + + public GenericFormatFileResult getOperationFileResult() { + return operationFileResult; + } + + public GenericFormatFileResult getParameterFileResult() { + return parameterFileResult; + } + + public GenericFormatFileResult getCatchFileResult() { + return catchFileResult; + } + + public GenericFormatFileResult getMarineLitterFileResult() { + return marineLitterFileResult; + } + + public GenericFormatFileResult getIndividualObservationFileResult() { + return individualObservationFileResult; + } + + public GenericFormatFileResult getAccidentalCatchFileResult() { + return accidentalCatchFileResult; + } + public GenericFormatImportRequest getImportRequest() { return importRequest; } @@ -208,68 +265,68 @@ public class GenericFormatImportContext implements Closeable { } - public CsvConsumerForSampleCategory loadSampleCategories() { - CsvConsumerForSampleCategory consumer = new CsvConsumerForSampleCategory(importRequest.getArchive().getSampleCategoryModelPath(), importRequest.getCsvSeparator(), importEntityParserFactory); + public CsvConsumerForSampleCategory loadSampleCategories(boolean failFast) { + CsvConsumerForSampleCategory consumer = new CsvConsumerForSampleCategory(importRequest.getArchive().getSampleCategoryModelPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); return consumer; } - public CsvConsumerForSurvey loadSurveys() { - CsvConsumerForSurvey consumer = new CsvConsumerForSurvey(importRequest.getArchive().getSurveyPath(), importRequest.getCsvSeparator(), importEntityParserFactory); + public CsvConsumerForSurvey loadSurveys(boolean failFast) { + CsvConsumerForSurvey consumer = new CsvConsumerForSurvey(importRequest.getArchive().getSurveyPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); return consumer; } - public CsvConsumerForGearCaracteristic loadGearCaracteristics() { - CsvConsumerForGearCaracteristic consumer = new CsvConsumerForGearCaracteristic(importRequest.getArchive().getGearCaracteristicsPath(), importRequest.getCsvSeparator(), importEntityParserFactory); + public CsvConsumerForGearCaracteristic loadGearCaracteristics(boolean failFast) { + CsvConsumerForGearCaracteristic consumer = new CsvConsumerForGearCaracteristic(importRequest.getArchive().getGearCaracteristicsPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); return consumer; } - public CsvConsumerForOperation loadOperations() { - CsvConsumerForOperation consumer = new CsvConsumerForOperation(importRequest.getArchive().getOperationPath(), importRequest.getCsvSeparator(), importEntityParserFactory); + public CsvConsumerForOperation loadOperations(boolean failFast) { + CsvConsumerForOperation consumer = new CsvConsumerForOperation(importRequest.getArchive().getOperationPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); return consumer; } - public CsvConsumerForParameter loadParameters() { - CsvConsumerForParameter consumer = new CsvConsumerForParameter(importRequest.getArchive().getParameterPath(), importRequest.getCsvSeparator(), importEntityParserFactory); + public CsvConsumerForParameter loadParameters(boolean failFast) { + CsvConsumerForParameter consumer = new CsvConsumerForParameter(importRequest.getArchive().getParameterPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); return consumer; } - public CsvConsumerForCatch loadCatches() { - CsvConsumerForCatch consumer = new CsvConsumerForCatch(importRequest.getArchive().getCatchPath(), importRequest.getCsvSeparator(), importRequest.getSampleCategoryModel(), importEntityParserFactory); + public CsvConsumerForCatch loadCatches(boolean failFast) { + CsvConsumerForCatch consumer = new CsvConsumerForCatch(importRequest.getArchive().getCatchPath(), importRequest.getCsvSeparator(), importRequest.getSampleCategoryModel(), importEntityParserFactory, failFast); return consumer; } - public CsvConsumerForMarineLitter loadMarineLitters() { - CsvConsumerForMarineLitter consumer = new CsvConsumerForMarineLitter(importRequest.getArchive().getMarineLitterPath(), importRequest.getCsvSeparator(), importEntityParserFactory); + public CsvConsumerForMarineLitter loadMarineLitters(boolean failFast) { + CsvConsumerForMarineLitter consumer = new CsvConsumerForMarineLitter(importRequest.getArchive().getMarineLitterPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); return consumer; } - public CsvConsumerForIndividualObservation loadIndividualObservations() { - CsvConsumerForIndividualObservation consumer = new CsvConsumerForIndividualObservation(importRequest.getArchive().getIndividualObservationPath(), importRequest.getCsvSeparator(), importEntityParserFactory); + public CsvConsumerForIndividualObservation loadIndividualObservations(boolean failFast) { + CsvConsumerForIndividualObservation consumer = new CsvConsumerForIndividualObservation(importRequest.getArchive().getIndividualObservationPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); return consumer; } - public CsvConsumerForAccidentalCatch loadAccidentalCatches() { - CsvConsumerForAccidentalCatch consumer = new CsvConsumerForAccidentalCatch(importRequest.getArchive().getAccidentalCatchPath(), importRequest.getCsvSeparator(), importEntityParserFactory); + public CsvConsumerForAccidentalCatch loadAccidentalCatches(boolean failFast) { + CsvConsumerForAccidentalCatch consumer = new CsvConsumerForAccidentalCatch(importRequest.getArchive().getAccidentalCatchPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); return consumer; } - public CsvConsumerForTemporaryGear loadTemporaryGears() { - CsvConsumerForTemporaryGear consumer = new CsvConsumerForTemporaryGear(importRequest.getArchive().getTemporaryReferentialGearsPath(), importRequest.getCsvSeparator()); + public CsvConsumerForTemporaryGear loadTemporaryGears(boolean failFast) { + CsvConsumerForTemporaryGear consumer = new CsvConsumerForTemporaryGear(importRequest.getArchive().getTemporaryReferentialGearsPath(), importRequest.getCsvSeparator(), failFast); return consumer; } - public CsvConsumerForTemporaryPerson loadTemporaryPersons() { - CsvConsumerForTemporaryPerson consumer = new CsvConsumerForTemporaryPerson(importRequest.getArchive().getTemporaryReferentialPersonsPath(), importRequest.getCsvSeparator()); + public CsvConsumerForTemporaryPerson loadTemporaryPersons(boolean failFast) { + CsvConsumerForTemporaryPerson consumer = new CsvConsumerForTemporaryPerson(importRequest.getArchive().getTemporaryReferentialPersonsPath(), importRequest.getCsvSeparator(), failFast); return consumer; } - public CsvConsumerForTemporarySpecies loadTemporarySpecies() { - CsvConsumerForTemporarySpecies consumer = new CsvConsumerForTemporarySpecies(importRequest.getArchive().getTemporaryReferentialSpeciesPath(), importRequest.getCsvSeparator()); + public CsvConsumerForTemporarySpecies loadTemporarySpecies(boolean reportError) { + CsvConsumerForTemporarySpecies consumer = new CsvConsumerForTemporarySpecies(importRequest.getArchive().getTemporaryReferentialSpeciesPath(), importRequest.getCsvSeparator(), reportError); return consumer; } - public CsvConsumerForTemporaryVessel loadTemporaryVessels() { - CsvConsumerForTemporaryVessel consumer = new CsvConsumerForTemporaryVessel(importRequest.getArchive().getTemporaryReferentialVesselsPath(), importRequest.getCsvSeparator()); + public CsvConsumerForTemporaryVessel loadTemporaryVessels(boolean reportError) { + CsvConsumerForTemporaryVessel consumer = new CsvConsumerForTemporaryVessel(importRequest.getArchive().getTemporaryReferentialVesselsPath(), importRequest.getCsvSeparator(), reportError); return consumer; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportRequest.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportRequest.java index 39c53df..52bdb9e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportRequest.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportRequest.java @@ -83,6 +83,10 @@ public class GenericFormatImportRequest implements Serializable { return startingDate; } + public GenericFormatImportConfiguration getImportConfiguration() { + return importConfiguration; + } + public Cruise getExistingCruise(Cruise importRowCruise) { Cruise result = null; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.