From ab5371f97d174c0b461d022f2c8ad1e51d1b3e56 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Thu, 13 Oct 2016 16:51:34 +0000 Subject: [PATCH] fixed returned url (now use the portletUrl as base url) git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133193 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../grsf_publish_ws/services/GrsfPublisherFisheryService.java | 4 ++-- .../grsf_publish_ws/services/GrsfPublisherStockService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java index feeb2ee..14b1ee1 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java @@ -202,7 +202,7 @@ public class GrsfPublisherFisheryService { List resources = HelperMethods.getResourcesFromBean(record, username); // if confirmed, set to visible TODO anyway if it is confirmed we should another method - boolean setPublic = false; + boolean setPublic = true; // check the license id String license = null; @@ -238,7 +238,7 @@ public class GrsfPublisherFisheryService { responseBean.setId(id); status = Status.CREATED; responseBean.setError(null); - responseBean.setDatasetUrl(catalogue.getCatalogueUrl() + "/dataset/" + futureName); + responseBean.setDatasetUrl(catalogue.getPortletUrl() + "?path=/dataset/" + futureName); if(!groups.isEmpty()){ logger.info("Launching thread for association to the list of groups " + groups); diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java index 8e007a2..3380faf 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java @@ -193,7 +193,7 @@ public class GrsfPublisherStockService { // evaluate the resources List resources = HelperMethods.getResourcesFromBean(record, username); - boolean setPublic = false; + boolean setPublic = true; // check the license id String license = null; @@ -229,7 +229,7 @@ public class GrsfPublisherStockService { responseBean.setId(id); status = Status.CREATED; responseBean.setError(null); - responseBean.setDatasetUrl(catalogue.getCatalogueUrl() + "/dataset/" + futureName); + responseBean.setDatasetUrl(catalogue.getPortletUrl() + "?path=/dataset/" + futureName); if(!groups.isEmpty()){ logger.info("Launching thread for association to the list of groups " + groups);