gCubeSystem
/
ckan2zenodo-publisher-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Trying to fix the issue reported at 

https://support.d4science.org/issues/19763#note-12
This commit is contained in:
Francesco Mangiacrapa 2020-09-23 11:38:26 +02:00
parent db79604770
commit e55251dfbb
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java
View File

@ -240,14 +240,18 @@ public class CkanToZendoPublisherWidget {
}
JSONValue theMessage = theErrorJSON.get("message");
return "Error reported from Zenodo: " + theMessage.toString();
// //GWT.log("array: "+array.toString());
// JSONObject theErrorValue = (JSONObject) array.get(0);
// //GWT.log("theErrorValue: "+theErrorValue.toString());
// JSONValue theMessage = theErrorValue.get("message");
// //GWT.log("message: "+message.toString());
// return "Error reported from Zenodo: " + theMessage.toString();
String theErrors = null;
try {
JSONValue theError = theErrorJSON.get("errors");
theErrors = theError.toString();
}catch (Exception e) {
//silent
}
String toReport = "Message reported from Zenodo: " + theMessage.toString();
if(theErrors!=null)
toReport+= " Errors: "+theErrors;
return toReport;
}
}catch (Exception e) {
return message;

2
src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java
View File

@ -104,7 +104,7 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
//Actually publish to zenodo :
// Step 1 : metadata
client= new Ckan2ZenodoImpl();
LOG.debug("Calling updatedMetadta for: "+zenodoDepositionPreview);
LOG.debug("Calling updatedMetadata for: "+zenodoDepositionPreview);
zenodoDepositionPreview = client.updatedMetadata(zenodoDepositionPreview);
//Step 2 : publish Resources

7
src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/converter/ItemToZenodoConverter.java
View File

@ -444,6 +444,13 @@ public class ItemToZenodoConverter {
*/
public static DepositionMetadata updateMetadataInfoOfDepositionMetadata(ZenodoMetadata metadata, DepositionMetadata depositionMetadata) {
//description
String description = metadata.getDescription();
LOG.debug("Read description: "+description);
if(description!=null) {
depositionMetadata.setDescription(description);
}
//upload type
SerializableEnum<String> uploadType = metadata.getUpload_type();
LOG.debug("Read upload type: "+uploadType);