From e55251dfbbcb568a0927cf917494af34dc8e4c2b Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 23 Sep 2020 11:38:26 +0200 Subject: [PATCH] Trying to fix the issue reported at https://support.d4science.org/issues/19763#note-12 --- .../client/CkanToZendoPublisherWidget.java | 20 +++++++++++-------- .../CkanToZenodoPublisherServiceImpl.java | 2 +- .../converter/ItemToZenodoConverter.java | 7 +++++++ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java index 2747342..46746cd 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java index f0c20af..6367540 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java @@ -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 diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/converter/ItemToZenodoConverter.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/converter/ItemToZenodoConverter.java index b04ddc0..78082b3 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/converter/ItemToZenodoConverter.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/converter/ItemToZenodoConverter.java @@ -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 uploadType = metadata.getUpload_type(); LOG.debug("Read upload type: "+uploadType);