From b2c05a2641c20c32da899c404b84a52e806f7c16 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Tue, 6 Dec 2016 18:04:02 +0000 Subject: [PATCH] minor fixes for url generation git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139733 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../grsf_publish_ws/services/GrsfPublisherFisheryService.java | 3 +-- .../grsf_publish_ws/services/GrsfPublisherStockService.java | 3 +-- 2 files changed, 2 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 35f9251..a748900 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 @@ -1,6 +1,5 @@ package org.gcube.data_catalogue.grsf_publish_ws.services; -import java.net.URLEncoder; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -242,7 +241,7 @@ public class GrsfPublisherFisheryService { responseBean.setId(id); status = Status.CREATED; responseBean.setError(null); - responseBean.setProductUrl(catalogue.getPortletUrl() + "?" + URLEncoder.encode("path=/dataset/" + futureName, "UTF-8")); + responseBean.setProductUrl(catalogue.getUrlFromDatasetIdOrName(id)); responseBean.setKbUuid(record.getUuid()); if(!groups.isEmpty()){ 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 b837611..a2fec04 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 @@ -1,6 +1,5 @@ package org.gcube.data_catalogue.grsf_publish_ws.services; -import java.net.URLEncoder; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -237,7 +236,7 @@ public class GrsfPublisherStockService { logger.info("Product created! Id is " + id); responseBean.setId(id); status = Status.CREATED; - responseBean.setProductUrl(catalogue.getPortletUrl() + "?" + URLEncoder.encode("path=/dataset/" + futureName, "UTF-8")); + responseBean.setProductUrl(catalogue.getUrlFromDatasetIdOrName(id)); responseBean.setKbUuid(record.getUuid()); if(!groups.isEmpty()){