gCubeSystem
/
ckan-util-library
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Costantino Perciante 2016-07-21 20:09:25 +00:00
parent 52e0ebcf5c
commit 580d19bbf0
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/gcube/datacatalogue/ckanutillibrary/CKanUtilsImpl.java
View File

@ -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<CkanLicense> 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();