Compare commits
No commits in common. "2cfd3bcf8b1f7173c8ab3ed5cc3234fb8f7d19e8" and "591ed6fcd921f197656468917aa374fed6790bc5" have entirely different histories.
2cfd3bcf8b
...
591ed6fcd9
|
@ -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("latest_draft") + "/actions/newversion" + "?access_token=" + zenodoToken;
|
||||
String newVersionUrl = links.get("self") + "/actions/newversion" + "?access_token=" + zenodoToken;
|
||||
logger.debug("new version url: " + newVersionUrl);
|
||||
createResponse = restTemplate.postForObject(newVersionUrl, null, Map.class);
|
||||
logger.debug("createResponse-newVersion:");
|
||||
|
@ -129,9 +129,7 @@ public class ZenodoDeposit implements RepositoryDeposit {
|
|||
// Second step, add the file to the entry.
|
||||
FileEnvelope pdfEnvelope = dmpDepositModel.getPdfFile();
|
||||
FileSystemResource fileSystemResource = new FileSystemResource(pdfEnvelope.getFile());
|
||||
HttpHeaders fileHeaders = new HttpHeaders();
|
||||
fileHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM);
|
||||
HttpEntity<FileSystemResource> addFileMapRequest = new HttpEntity<>(fileSystemResource, fileHeaders);
|
||||
HttpEntity<FileSystemResource> addFileMapRequest = new HttpEntity<>(fileSystemResource, null);
|
||||
|
||||
String addFileUrl = links.get("bucket") + "/" + pdfEnvelope.getFilename() + "?access_token=" + zenodoToken;
|
||||
restTemplate.put(addFileUrl, addFileMapRequest);
|
||||
|
@ -167,7 +165,7 @@ public class ZenodoDeposit implements RepositoryDeposit {
|
|||
File supportinFilesZip = dmpDepositModel.getSupportingFilesZip();
|
||||
String supportinFilesZipName = dmpDepositModel.getSupportingFilesZip().getName();
|
||||
fileSystemResource = new FileSystemResource(supportinFilesZip);
|
||||
addFileMapRequest = new HttpEntity<>(fileSystemResource, jsonHeaders);
|
||||
addFileMapRequest = new HttpEntity<>(fileSystemResource, null);
|
||||
|
||||
addFileUrl = links.get("bucket") + "/" + supportinFilesZipName + "?access_token=" + zenodoToken;
|
||||
restTemplate.put(addFileUrl, addFileMapRequest);
|
||||
|
|
Loading…
Reference in New Issue