Compare commits

...

3 Commits

Author SHA1 Message Date
Diamantis Tziotzios 2cfd3bcf8b fix for suportive files upload 2024-04-18 13:18:35 +03:00
George Kalampokis 0911f52a29 Fix new version url
(cherry picked from commit a0150f8c0f)
2024-01-17 17:35:07 +02:00
George Kalampokis 0548d0b352 Add missing header
(cherry picked from commit 3b40f31cd0)
2024-01-17 17:34:50 +02:00
1 changed files with 5 additions and 3 deletions

View File

@ -88,7 +88,7 @@ public class ZenodoDeposit implements RepositoryDeposit {
logger.debug(objectMapper.writeValueAsString(createResponse));
links = (LinkedHashMap<String, String>) createResponse.get("links");
//Second, make the new version (not in the links?)
String newVersionUrl = links.get("self") + "/actions/newversion" + "?access_token=" + zenodoToken;
String newVersionUrl = links.get("latest_draft") + "/actions/newversion" + "?access_token=" + zenodoToken;
logger.debug("new version url: " + newVersionUrl);
createResponse = restTemplate.postForObject(newVersionUrl, null, Map.class);
logger.debug("createResponse-newVersion:");
@ -129,7 +129,9 @@ public class ZenodoDeposit implements RepositoryDeposit {
// Second step, add the file to the entry.
FileEnvelope pdfEnvelope = dmpDepositModel.getPdfFile();
FileSystemResource fileSystemResource = new FileSystemResource(pdfEnvelope.getFile());
HttpEntity<FileSystemResource> addFileMapRequest = new HttpEntity<>(fileSystemResource, null);
HttpHeaders fileHeaders = new HttpHeaders();
fileHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM);
HttpEntity<FileSystemResource> addFileMapRequest = new HttpEntity<>(fileSystemResource, fileHeaders);
String addFileUrl = links.get("bucket") + "/" + pdfEnvelope.getFilename() + "?access_token=" + zenodoToken;
restTemplate.put(addFileUrl, addFileMapRequest);
@ -165,7 +167,7 @@ public class ZenodoDeposit implements RepositoryDeposit {
File supportinFilesZip = dmpDepositModel.getSupportingFilesZip();
String supportinFilesZipName = dmpDepositModel.getSupportingFilesZip().getName();
fileSystemResource = new FileSystemResource(supportinFilesZip);
addFileMapRequest = new HttpEntity<>(fileSystemResource, null);
addFileMapRequest = new HttpEntity<>(fileSystemResource, jsonHeaders);
addFileUrl = links.get("bucket") + "/" + supportinFilesZipName + "?access_token=" + zenodoToken;
restTemplate.put(addFileUrl, addFileMapRequest);