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 7bf0b6e62cd1bab860c0013923f79b3f0d87cd73 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 24 20:43:28 2015 +0100 add report file in configuration --- .../genericformat/GenericFormatImportConfiguration.java | 10 ++++++++++ .../service/genericformat/GenericFormatImportRequest.java | 6 ++++++ .../tutti/service/genericformat/GenericFormatImportResult.java | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportConfiguration.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportConfiguration.java index f203f29..62a8c77 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportConfiguration.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportConfiguration.java @@ -17,6 +17,8 @@ public class GenericFormatImportConfiguration implements Serializable { private File importFile; + private File reportFile; + private boolean cleanWeights; private boolean checkWeights; @@ -39,6 +41,14 @@ public class GenericFormatImportConfiguration implements Serializable { this.importFile = importFile; } + public File getReportFile() { + return reportFile; + } + + public void setReportFile(File reportFile) { + this.reportFile = reportFile; + } + public boolean isCleanWeights() { return cleanWeights; } 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 9b06b87..cd40464 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 @@ -6,6 +6,7 @@ import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; +import java.io.File; import java.util.Set; /** @@ -98,4 +99,9 @@ public class GenericFormatImportRequest { public boolean isOverrideData() { return importConfiguration.isOverrideData(); } + + public File getReportFile() { + return importConfiguration.getReportFile(); + } + } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportResult.java index f4b939d..027670c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportResult.java @@ -11,6 +11,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; +import java.io.File; import java.io.Serializable; import java.util.Collection; import java.util.LinkedHashMap; @@ -44,11 +45,14 @@ public class GenericFormatImportResult implements Serializable{ private final GenericFormatArchive archive; + private final File reportFile; + private boolean valid; public GenericFormatImportResult(GenericFormatImportContext importContext) { this.archive = importContext.getImportRequest().getArchive(); + this.reportFile= importContext.getImportRequest().getReportFile(); this.cruiseResults = new LinkedHashMap<>(); this.errors = new LinkedHashSet<>(); this.protocol = importContext.getImportedProtocol(); @@ -126,6 +130,10 @@ public class GenericFormatImportResult implements Serializable{ return importedVessels; } + public File getReportFile() { + return reportFile; + } + public void addFishingOperationCheckError(Cruise cruise, String fishingOperationId, String checkError) { GenericFormatImportCruiseResult importedCruiseResult = getImportedCruiseResult(cruise.getId()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.