hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-14 13:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DURACOM-153] fix validation to use the retrieved zip file on saf import

Browse Source
This commit is contained in:
Francesco Pio Scognamiglio
2023-06-08 13:50:11 +02:00
parent 13344aabf9
commit 7757c4e898
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-api/src/main/java/org/dspace/app/itemimport/ItemImport.java
View File

@@ -332,17 +332,19 @@ public class ItemImport extends DSpaceRunnable<ItemImportScriptConfiguration> {
*/ */
protected void readZip(Context context, ItemImportService itemImportService) throws Exception { protected void readZip(Context context, ItemImportService itemImportService) throws Exception {
Optional<InputStream> optionalFileStream = Optional.empty(); Optional<InputStream> optionalFileStream = Optional.empty();
Optional<InputStream> validationFileStream = Optional.empty();
if (!remoteUrl) { if (!remoteUrl) {
// manage zip via upload // manage zip via upload
optionalFileStream = handler.getFileStream(context, zipfilename); optionalFileStream = handler.getFileStream(context, zipfilename);
validationFileStream = handler.getFileStream(context, zipfilename);
} else { } else {
// manage zip via remote url // manage zip via remote url
optionalFileStream = Optional.ofNullable(new URL(zipfilename).openStream()); optionalFileStream = Optional.ofNullable(new URL(zipfilename).openStream());
validationFileStream = Optional.ofNullable(new URL(zipfilename).openStream());
} }
if (optionalFileStream.isPresent()) { if (validationFileStream.isPresent()) {
// validate zip file // validate zip file
Optional<InputStream> validationFileStream = handler.getFileStream(context, zipfilename);
if (validationFileStream.isPresent()) { if (validationFileStream.isPresent()) {
validateZip(validationFileStream.get()); validateZip(validationFileStream.get());
} }