migrated the method 'createGroup'
This commit is contained in:
parent
d235b81231
commit
7442e8a671
33
pom.xml
33
pom.xml
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
<groupId>org.gcube.portlets.widgets</groupId>
|
<groupId>org.gcube.portlets.widgets</groupId>
|
||||||
<artifactId>ckan-metadata-publisher-widget</artifactId>
|
<artifactId>ckan-metadata-publisher-widget</artifactId>
|
||||||
<version>1.6.1</version>
|
<version>2.0.0-SNAPSHOT</version>
|
||||||
<name>gCube Ckan metadata publisher widget</name>
|
<name>gCube Ckan metadata publisher widget</name>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
|
@ -145,18 +145,29 @@
|
||||||
<version>[2.0.0,)</version>
|
<version>[2.0.0,)</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- <dependency> -->
|
||||||
|
<!-- <groupId>org.gcube.data-catalogue</groupId> -->
|
||||||
|
<!-- <artifactId>ckan-util-library</artifactId> -->
|
||||||
|
<!-- <version>[2.0.0, 3.0.0-SNAPSHOT)</version> -->
|
||||||
|
<!-- <scope>compile</scope> -->
|
||||||
|
<!-- <exclusions> -->
|
||||||
|
<!-- <exclusion> -->
|
||||||
|
<!-- <groupId>org.gcube.data-catalogue</groupId> -->
|
||||||
|
<!-- <artifactId>gcubedatacatalogue-metadata-discovery</artifactId> -->
|
||||||
|
<!-- </exclusion> -->
|
||||||
|
<!-- </exclusions> -->
|
||||||
|
<!-- </dependency> -->
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.data-catalogue</groupId>
|
<groupId>org.gcube.datacatalogue</groupId>
|
||||||
<artifactId>ckan-util-library</artifactId>
|
<artifactId>catalogue-util-library</artifactId>
|
||||||
<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
|
<version>0.1.0-SNAPSHOT</version>
|
||||||
<scope>compile</scope>
|
<scope>system</scope>
|
||||||
<exclusions>
|
<systemPath>/home/francesco/git/catalogue-util-library/target/catalogue-util-library-0.1.0-SNAPSHOT.jar</systemPath>
|
||||||
<exclusion>
|
|
||||||
<groupId>org.gcube.data-catalogue</groupId>
|
|
||||||
<artifactId>gcubedatacatalogue-metadata-discovery</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.core</groupId>
|
<groupId>org.gcube.core</groupId>
|
||||||
<artifactId>common-scope-maps</artifactId>
|
<artifactId>common-scope-maps</artifactId>
|
||||||
|
|
|
@ -48,9 +48,9 @@ import com.liferay.portal.kernel.log.Log;
|
||||||
import com.liferay.portal.kernel.log.LogFactoryUtil;
|
import com.liferay.portal.kernel.log.LogFactoryUtil;
|
||||||
import com.liferay.portal.service.UserLocalServiceUtil;
|
import com.liferay.portal.service.UserLocalServiceUtil;
|
||||||
|
|
||||||
import eu.trentorise.opendata.jackan.model.CkanGroup;
|
|
||||||
import eu.trentorise.opendata.jackan.model.CkanLicense;
|
import eu.trentorise.opendata.jackan.model.CkanLicense;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Server side of the data publisher.
|
* Server side of the data publisher.
|
||||||
* @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
|
* @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
|
||||||
|
@ -328,12 +328,33 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
|
||||||
logger.debug("The user wants to publish in organization with name " + organizationNameOrId);
|
logger.debug("The user wants to publish in organization with name " + organizationNameOrId);
|
||||||
String scope = getScopeFromOrgName(organizationNameOrId);
|
String scope = getScopeFromOrgName(organizationNameOrId);
|
||||||
DataCatalogue utils = getCatalogue(scope);
|
DataCatalogue utils = getCatalogue(scope);
|
||||||
String userApiKey = utils.getApiKeyFromUsername(userName);
|
|
||||||
|
|
||||||
|
String datasetId = utils.createCKanDatasetMultipleCustomFields(userName,
|
||||||
|
title,
|
||||||
|
null,
|
||||||
|
organizationNameOrId,
|
||||||
|
author,
|
||||||
|
authorMail,
|
||||||
|
maintainer,
|
||||||
|
maintainerMail,
|
||||||
|
version,
|
||||||
|
description,
|
||||||
|
licenseId,
|
||||||
|
listOfTags,
|
||||||
|
customFields,
|
||||||
|
resources,
|
||||||
|
setPublic,
|
||||||
|
true);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* OLD CODE
|
||||||
|
|
||||||
|
String userApiKey = utils.getApiKeyFromUsername(userName);
|
||||||
|
|
||||||
String datasetId = utils.createCKanDatasetMultipleCustomFields
|
String datasetId = utils.createCKanDatasetMultipleCustomFields
|
||||||
(userApiKey, title, null, organizationNameOrId, author, authorMail, maintainer,
|
(userApiKey, title, null, organizationNameOrId, author, authorMail, maintainer,
|
||||||
maintainerMail, version, description, licenseId, listOfTags, customFields, resources, setPublic);
|
maintainerMail, version, description, licenseId, listOfTags, customFields, resources, setPublic);
|
||||||
|
*/
|
||||||
if(datasetId != null){
|
if(datasetId != null){
|
||||||
|
|
||||||
logger.info("Dataset created!");
|
logger.info("Dataset created!");
|
||||||
|
@ -344,9 +365,15 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
|
||||||
toCreate.setSource(datasetUrl);
|
toCreate.setSource(datasetUrl);
|
||||||
|
|
||||||
// add also this information as custom field
|
// add also this information as custom field
|
||||||
|
/**
|
||||||
|
* TODO NEEDED TO BE CHECK
|
||||||
|
*
|
||||||
|
* OLD CODE NOT NEEDED. NOW IT IS PERFORMED BY gCAT
|
||||||
Map<String, List<String>> addField = new HashMap<String, List<String>>();
|
Map<String, List<String>> addField = new HashMap<String, List<String>>();
|
||||||
addField.put(ITEM_URL_FIELD, Arrays.asList(datasetUrl));
|
addField.put(ITEM_URL_FIELD, Arrays.asList(datasetUrl));
|
||||||
utils.patchProductCustomFields(datasetId, userApiKey, addField, false);
|
utils.patchProductCustomFields(datasetId, userApiKey, addField, false);
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
// start a thread that will associate this dataset with the group
|
// start a thread that will associate this dataset with the group
|
||||||
if(/*toCreate.getChosenType() != null ||*/ toCreate.getGroups() != null){
|
if(/*toCreate.getChosenType() != null ||*/ toCreate.getGroups() != null){
|
||||||
|
|
Loading…
Reference in New Issue