From 580d19bbf09afab7e2bd38e237bcc7886dc65e97 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Thu, 21 Jul 2016 20:09:25 +0000 Subject: [PATCH] fix for production root git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/ckan-util-library@130664 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../ckanutillibrary/CKanUtilsImpl.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CKanUtilsImpl.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CKanUtilsImpl.java index 209e05c..8b52962 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CKanUtilsImpl.java +++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CKanUtilsImpl.java @@ -19,6 +19,7 @@ import javax.net.ssl.HttpsURLConnection; import net.htmlparser.jericho.Renderer; import net.htmlparser.jericho.Segment; import net.htmlparser.jericho.Source; + import org.gcube.datacatalogue.ckanutillibrary.models.CKanUserWrapper; import org.gcube.datacatalogue.ckanutillibrary.models.ResourceBean; import org.gcube.datacatalogue.ckanutillibrary.models.RolesIntoOrganization; @@ -49,6 +50,12 @@ import eu.trentorise.opendata.jackan.model.CkanUser; */ public class CKanUtilsImpl implements CKanUtils{ + + // TO BE REMOVED TODO + private final static String PRODUCTION_SCOPE_ROOT = "/d4science.research-infrastructures.eu"; + private final static String PRODUCTION_CKAN_ORGNAME_ROOT = "d4science"; + private final static String PRODUCTION_LIFERAY_ORGNAME_ROOT = "d4science"; + private static final Logger logger = LoggerFactory.getLogger(CKanUtilsImpl.class); private String CKAN_CATALOGUE_URL; @@ -401,7 +408,7 @@ public class CKanUtilsImpl implements CKanUtils{ return result; } - + @Override public List getLicenses() { logger.debug("Request for CKAN licenses (original jackan objects are going to be retrieved)"); @@ -702,7 +709,13 @@ public class CKanUtilsImpl implements CKanUtils{ String ckanUsername = UtilMethods.fromUsernameToCKanUsername(username); // check if this role is already present in ckan for this user within the organization - boolean alreadyPresent = isRoleAlreadySet(ckanUsername, organizationName.toLowerCase(), correspondentRoleToCheck); + String organizationNameToCheck; + if(organizationName.equals(PRODUCTION_LIFERAY_ORGNAME_ROOT)) + organizationNameToCheck = PRODUCTION_CKAN_ORGNAME_ROOT; + else + organizationNameToCheck = organizationName.toLowerCase(); + + boolean alreadyPresent = isRoleAlreadySet(ckanUsername, organizationNameToCheck, correspondentRoleToCheck); if(alreadyPresent) return true; // just return @@ -719,7 +732,7 @@ public class CKanUtilsImpl implements CKanUtils{ + "}"; // replace those values - parameter = parameter.replace("ORGANIZATION_ID_NAME", organizationName.toLowerCase()); + parameter = parameter.replace("ORGANIZATION_ID_NAME", organizationNameToCheck); parameter = parameter.replace("USERNAME_ID_NAME", ckanUsername); parameter = parameter.replace("ROLE", correspondentRoleToCheck.toString().toLowerCase()); @@ -811,7 +824,7 @@ public class CKanUtilsImpl implements CKanUtils{ logger.info("CKan organization created [" + connection.getResponseMessage() + "]"); result = true; } - + // close the connection connection.disconnect();