MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

don't deposit empty supportingFiles.zip when no files are uploaded in datasets

This commit is contained in:
Bernaldo Mihasi 2022-12-08 13:02:08 +02:00
parent e1a3e9b7bc
commit 572be373e5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dmp-backend/dataverseRepository/src/main/java/eu/eudat/depositinterface/dataverserepository/interfaces/DataverseDeposit.java
View File

@ -150,7 +150,9 @@ public class DataverseDeposit implements RepositoryDeposit {
this.uploadFile(jsonFileName, rdaJson, doi); this.uploadFile(jsonFileName, rdaJson, doi);
Files.deleteIfExists(rdaJson.toPath()); Files.deleteIfExists(rdaJson.toPath());
this.uploadFile(dmpDepositModel.getSupportingFilesZip().getName(), dmpDepositModel.getSupportingFilesZip(), doi); if(dmpDepositModel.getSupportingFilesZip() != null) {
this.uploadFile(dmpDepositModel.getSupportingFilesZip().getName(), dmpDepositModel.getSupportingFilesZip(), doi);
}
} }
private Map<String, Object> getDatasetIdentifier(String previousDOI) { private Map<String, Object> getDatasetIdentifier(String previousDOI) {

6
dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
View File

@ -2196,7 +2196,7 @@ public class DataManagementPlanManager {
FileOutputStream fout = new FileOutputStream(this.environment.getProperty("temp.temp") + "supportingFiles.zip"); FileOutputStream fout = new FileOutputStream(this.environment.getProperty("temp.temp") + "supportingFiles.zip");
ZipOutputStream zout = new ZipOutputStream(fout); ZipOutputStream zout = new ZipOutputStream(fout);
//List<File> supportingFiles = new ArrayList<>(); boolean hasFileUploaded = false;
Set<Dataset> datasets = dmp.getDataset(); Set<Dataset> datasets = dmp.getDataset();
for (Dataset dataset : datasets) { for (Dataset dataset : datasets) {
List<FileUpload> files = this.apiContext.getOperationsContext().getDatabaseRepository().getFileUploadDao().getFileUploads(dataset.getId()); List<FileUpload> files = this.apiContext.getOperationsContext().getDatabaseRepository().getFileUploadDao().getFileUploads(dataset.getId());
@ -2209,12 +2209,12 @@ public class DataManagementPlanManager {
zout.putNextEntry(ze); zout.putNextEntry(ze);
zout.write(content, 0, content.length); zout.write(content, 0, content.length);
zout.closeEntry(); zout.closeEntry();
hasFileUploaded = true;
} }
} }
} }
zout.close(); zout.close();
return new File(this.environment.getProperty("temp.temp") + "supportingFiles.zip"); return hasFileUploaded ? new File(this.environment.getProperty("temp.temp") + "supportingFiles.zip") : null;
} }
/* /*