Compare commits
3 Commits
591ed6fcd9
...
2cfd3bcf8b
Author | SHA1 | Date |
---|---|---|
Diamantis Tziotzios | 2cfd3bcf8b | |
George Kalampokis | 0911f52a29 | |
George Kalampokis | 0548d0b352 |
|
@ -88,7 +88,7 @@ public class ZenodoDeposit implements RepositoryDeposit {
|
||||||
logger.debug(objectMapper.writeValueAsString(createResponse));
|
logger.debug(objectMapper.writeValueAsString(createResponse));
|
||||||
links = (LinkedHashMap<String, String>) createResponse.get("links");
|
links = (LinkedHashMap<String, String>) createResponse.get("links");
|
||||||
//Second, make the new version (not in the 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);
|
logger.debug("new version url: " + newVersionUrl);
|
||||||
createResponse = restTemplate.postForObject(newVersionUrl, null, Map.class);
|
createResponse = restTemplate.postForObject(newVersionUrl, null, Map.class);
|
||||||
logger.debug("createResponse-newVersion:");
|
logger.debug("createResponse-newVersion:");
|
||||||
|
@ -129,7 +129,9 @@ public class ZenodoDeposit implements RepositoryDeposit {
|
||||||
// Second step, add the file to the entry.
|
// Second step, add the file to the entry.
|
||||||
FileEnvelope pdfEnvelope = dmpDepositModel.getPdfFile();
|
FileEnvelope pdfEnvelope = dmpDepositModel.getPdfFile();
|
||||||
FileSystemResource fileSystemResource = new FileSystemResource(pdfEnvelope.getFile());
|
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;
|
String addFileUrl = links.get("bucket") + "/" + pdfEnvelope.getFilename() + "?access_token=" + zenodoToken;
|
||||||
restTemplate.put(addFileUrl, addFileMapRequest);
|
restTemplate.put(addFileUrl, addFileMapRequest);
|
||||||
|
@ -165,7 +167,7 @@ public class ZenodoDeposit implements RepositoryDeposit {
|
||||||
File supportinFilesZip = dmpDepositModel.getSupportingFilesZip();
|
File supportinFilesZip = dmpDepositModel.getSupportingFilesZip();
|
||||||
String supportinFilesZipName = dmpDepositModel.getSupportingFilesZip().getName();
|
String supportinFilesZipName = dmpDepositModel.getSupportingFilesZip().getName();
|
||||||
fileSystemResource = new FileSystemResource(supportinFilesZip);
|
fileSystemResource = new FileSystemResource(supportinFilesZip);
|
||||||
addFileMapRequest = new HttpEntity<>(fileSystemResource, null);
|
addFileMapRequest = new HttpEntity<>(fileSystemResource, jsonHeaders);
|
||||||
|
|
||||||
addFileUrl = links.get("bucket") + "/" + supportinFilesZipName + "?access_token=" + zenodoToken;
|
addFileUrl = links.get("bucket") + "/" + supportinFilesZipName + "?access_token=" + zenodoToken;
|
||||||
restTemplate.put(addFileUrl, addFileMapRequest);
|
restTemplate.put(addFileUrl, addFileMapRequest);
|
||||||
|
|
Loading…
Reference in New Issue