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 992a37c..3a0d900 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 @@ -153,7 +153,7 @@ public class CkanToZendoPublisherWidget { } @Override - public void onSuccess(String result) { + public void onSuccess(String doi) { buttonPublish.setEnabled(false); basicTabPanel.getElement().getStyle().setOpacity(1.0); try { @@ -163,6 +163,9 @@ public class CkanToZendoPublisherWidget { } String msg = "The item has been uploaded to Zenodo correctly"; + if(doi!=null) + msg+=" "+doi; + Alert infoLabel = new Alert(); infoLabel.setClose(false); infoLabel.setType(AlertType.INFO); diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZenodoPublisherService.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZenodoPublisherService.java index c720106..0226c3b 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZenodoPublisherService.java +++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZenodoPublisherService.java @@ -10,14 +10,38 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; /** * The client side stub for the RPC service. + * + * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) + * + * Jan 28, 2020 */ @RemoteServiceRelativePath("ckantozenodo") public interface CkanToZenodoPublisherService extends RemoteService { + /** + * Convert to zenodo item. + * + * @param item the item + * @return the zenodo item + * @throws Exception the exception + */ ZenodoItem convertToZenodoItem(CatalogueItem item) throws Exception; + /** + * Publish on zenodo. + * + * @param zenodoItem the zenodo item + * @return the DOI of published Zenodo Item + * @throws Exception the exception + */ String publishOnZenodo(ZenodoItem zenodoItem) throws Exception; + /** + * Read fields descriptions. + * + * @return the map + * @throws Exception the exception + */ Map readFieldsDescriptions() throws Exception; } 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 b79c482..3c0e6f6 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 @@ -106,7 +106,7 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple //Finalize LOG.debug("Calling publish on Zenodo for: "+zenodoDepositionPreview); zenodoDepositionPreview = client.publish(zenodoDepositionPreview, item); - return zenodoDepositionPreview.toString(); + return zenodoDepositionPreview.getDoi(); }catch (TimeoutException e) { String error = "I'm waiting too time for publishing on Zenodo the catalogue item: "+zenodoItem.getName()+". Check by yourself the result later";