Chagend EntityContext.PRODUCT to EntityContext.DATASET
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/ckan-util-library@178898 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
dec8bf5652
commit
63e93dd4d7
|
@ -1061,7 +1061,7 @@ public class DataCatalogueImpl implements DataCatalogue{
|
||||||
if(dataset != null){
|
if(dataset != null){
|
||||||
|
|
||||||
if(getUriResolverUrl() != null)
|
if(getUriResolverUrl() != null)
|
||||||
url = getUrlForProduct(CONTEXT, EntityContext.PRODUCT, name);
|
url = getUrlForProduct(CONTEXT, EntityContext.DATASET, name);
|
||||||
|
|
||||||
if(url == null || url.isEmpty())
|
if(url == null || url.isEmpty())
|
||||||
url = getPortletUrl() + "?" + URLEncoder.encode("path=/dataset/" + name, "UTF-8");
|
url = getPortletUrl() + "?" + URLEncoder.encode("path=/dataset/" + name, "UTF-8");
|
||||||
|
@ -1091,7 +1091,7 @@ public class DataCatalogueImpl implements DataCatalogue{
|
||||||
if(dataset != null){
|
if(dataset != null){
|
||||||
|
|
||||||
if(getUriResolverUrl() != null)
|
if(getUriResolverUrl() != null)
|
||||||
url = getUrlForProduct(CONTEXT, EntityContext.PRODUCT, name);
|
url = getUrlForProduct(CONTEXT, EntityContext.DATASET, name);
|
||||||
|
|
||||||
if(url == null || url.isEmpty())
|
if(url == null || url.isEmpty())
|
||||||
url = getPortletUrl() + "?" + URLEncoder.encode("path=/dataset/" + name, "UTF-8");
|
url = getPortletUrl() + "?" + URLEncoder.encode("path=/dataset/" + name, "UTF-8");
|
||||||
|
|
|
@ -6,7 +6,7 @@ package org.gcube.datacatalogue.ckanutillibrary.server.utils.url;
|
||||||
*/
|
*/
|
||||||
public enum EntityContext {
|
public enum EntityContext {
|
||||||
|
|
||||||
PRODUCT("product"),
|
DATASET("dataset"),
|
||||||
GROUP("group"),
|
GROUP("group"),
|
||||||
ORGANIZATION("organization");
|
ORGANIZATION("organization");
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue