Make case name independent of file name #17
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: EL-MHARI Charaf <charaf.elmhari@rte-france.com>
SlimaneAmar
reviewed
Sep 17, 2024
src/main/java/org/gridsuite/caseimport/server/CaseImportController.java
Outdated
Show resolved
Hide resolved
When not given or empty, use filename as case name Signed-off-by: EL-MHARI Charaf <charaf.elmhari@rte-france.com>
SlimaneAmar
requested changes
Sep 19, 2024
src/main/java/org/gridsuite/caseimport/server/CaseImportController.java
Outdated
Show resolved
Hide resolved
Signed-off-by: EL-MHARI Charaf <charaf.elmhari@rte-france.com>
SlimaneAmar
approved these changes
Sep 23, 2024
src/main/java/org/gridsuite/caseimport/server/CaseImportService.java
Outdated
Show resolved
Hide resolved
src/main/java/org/gridsuite/caseimport/server/CaseImportService.java
Outdated
Show resolved
Hide resolved
| String targetDirectory = getTargetDirectory(caseOrigin); | ||
| UUID caseUuid = caseService.importCase(caseFile); | ||
| var caseElementAttributes = new ElementAttributes(caseUuid, caseFile.getOriginalFilename(), CASE, new AccessRightsAttributes(false), userId, 0L, null); | ||
| String caseName = caseNameParam == null || caseNameParam.trim().isEmpty() ? caseFile.getOriginalFilename() : caseNameParam; |
There was a problem hiding this comment.
Suggested change
| String caseName = caseNameParam == null || caseNameParam.trim().isEmpty() ? caseFile.getOriginalFilename() : caseNameParam; | |
| String caseName = caseNameParam == null || caseNameParam.trim().isEmpty() ? DataSourceUtil.getBaseName(Paths.get(caseFile.getOriginalFilename())) : caseNameParam; |
There was a problem hiding this comment.
This would avoid to have this extensions in the name in gridexplore for example. But maybe it rather should be done in case-server
Signed-off-by: EL-MHARI Charaf <charaf.elmhari@rte-france.com>
etiennehomer
approved these changes
Sep 23, 2024
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, the case import server uses the filename as the case name. This leads to extensions in case names.
For example: import caseFile.xml.gz will lead to case name caseFile.xml.gz.
The goal is to allow the client to choose a case name different that the file name.