gCubeSystem
/
ckan-metadata-publisher-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system:type property is now added automatically. Fixed discovery tags vocabulary class 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@146619 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante 2017-04-06 12:42:00 +00:00
parent 7d5e7a4978
commit 521901629f
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/ui/dataset/resources/TagsPanel.java
View File

@ -53,7 +53,7 @@ public class TagsPanel extends Composite{
public TagsPanel() { public TagsPanel() {
initWidget(uiBinder.createAndBindUi(this)); initWidget(uiBinder.createAndBindUi(this));
tagsEnterListBox.setVisible(true); tagsEnterListBox.setVisible(false);
} }

7
src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
View File

@ -252,14 +252,17 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
*/ */
private List<String> discoverTagsVocabulary(String context) { private List<String> discoverTagsVocabulary(String context) {
logger.debug("Looking for vocabulary of tags in this context " + context);
String keyPerVocabulary = UtilMethods.concatenateSessionKeyScope("TAGS_VOCABULARY", context); // TODO REMOVE String keyPerVocabulary = UtilMethods.concatenateSessionKeyScope("TAGS_VOCABULARY", context); // TODO REMOVE
List<String> vocabulary = (List<String>) getThreadLocalRequest().getSession().getAttribute(keyPerVocabulary); List<String> vocabulary = (List<String>) getThreadLocalRequest().getSession().getAttribute(keyPerVocabulary);
if(vocabulary != null){ if(vocabulary == null){
vocabulary = new DiscoverTagsList(context).getTagsVocabulary(); vocabulary = new DiscoverTagsList(context).getTagsVocabulary();
getThreadLocalRequest().getSession().setAttribute(keyPerVocabulary, vocabulary); getThreadLocalRequest().getSession().setAttribute(keyPerVocabulary, vocabulary);
} }
logger.debug("Vocabulary for tags is " + vocabulary);
return vocabulary; return vocabulary;
} }
@ -285,7 +288,7 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
// add Type for custom fields // add Type for custom fields
if(toCreate.getChosenType() != null) if(toCreate.getChosenType() != null)
customFields.put("Type", Arrays.asList(toCreate.getChosenType())); customFields.put("system:type", Arrays.asList(toCreate.getChosenType()));
boolean setPublic = toCreate.getVisibility(); boolean setPublic = toCreate.getVisibility();

4
src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/utils/DiscoverTagsList.java
View File

@ -31,7 +31,7 @@ import com.liferay.portal.kernel.log.LogFactoryUtil;
public class DiscoverTagsList { public class DiscoverTagsList {
private static final Log logger = LogFactoryUtil.getLog(CKANPublisherServicesImpl.class); private static final Log logger = LogFactoryUtil.getLog(CKANPublisherServicesImpl.class);
List<String> tagsVocabulary; private List<String> tagsVocabulary;
private final static String APPLICATION_PROFILE_NAME = "Tags"; private final static String APPLICATION_PROFILE_NAME = "Tags";
private final static String QUERY = "for $profile in collection('/db/Profiles/GenericResource')//Resource " + private final static String QUERY = "for $profile in collection('/db/Profiles/GenericResource')//Resource " +
@ -62,7 +62,7 @@ public class DiscoverTagsList {
Node node = docBuilder.parse(new InputSource(new StringReader(elem))).getDocumentElement(); Node node = docBuilder.parse(new InputSource(new StringReader(elem))).getDocumentElement();
XPathHelper helper = new XPathHelper(node); XPathHelper helper = new XPathHelper(node);
tagsVocabulary = helper.evaluate("/Resource/Profile/Body/tags/tag/text()"); tagsVocabulary = helper.evaluate("/Resource/Profile/Body/tags/tag/text()");
logger.trace("Retrieved tags " + tagsVocabulary); logger.debug("Retrieved tags " + tagsVocabulary);
} }
}catch(Exception e){ }catch(Exception e){
logger.warn("Failed to retrieve this information " + e.getMessage()); logger.warn("Failed to retrieve this information " + e.getMessage());