From 246880a45dde6565fa3eb5f5a8d333e3d5149d53 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 29 May 2014 16:31:17 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@96308 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../ExtractCodelistOperationMap.java | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractCodelistOperationMap.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractCodelistOperationMap.java index 26d5961..782b9db 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractCodelistOperationMap.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/ExtractCodelistOperationMap.java @@ -2,13 +2,18 @@ package org.gcube.portlets.user.td.gwtservice.server.trservice; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.gcube.data.analysis.tabulardata.model.column.ColumnLocalId; import org.gcube.data.analysis.tabulardata.model.column.ColumnReference; import org.gcube.data.analysis.tabulardata.model.column.ColumnType; import org.gcube.data.analysis.tabulardata.model.datatype.value.TDText; +import org.gcube.data.analysis.tabulardata.model.metadata.column.ColumnMetadata; import org.gcube.data.analysis.tabulardata.model.metadata.column.DataLocaleMetadata; +import org.gcube.data.analysis.tabulardata.model.metadata.common.ImmutableLocalizedText; +import org.gcube.data.analysis.tabulardata.model.metadata.common.LocalizedText; +import org.gcube.data.analysis.tabulardata.model.metadata.common.NamesMetadata; import org.gcube.data.analysis.tabulardata.model.table.TableId; import org.gcube.portlets.user.td.gwtservice.shared.Constants; import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistSession; @@ -65,15 +70,28 @@ public class ExtractCodelistOperationMap { column_definition.put( Constants.PARAMETER_EXTRACT_CODELIST_COLUMN_TYPE, columnType); - + + ArrayList metadata=new ArrayList(); + if (columnTypeCode == ColumnTypeCode.CODENAME) { DataLocaleMetadata dataLocaleMetadata = new DataLocaleMetadata( defNewColumn.getLocaleName()); - column_definition.put( - Constants.PARAMETER_EXTRACT_CODELIST_METADATA, - dataLocaleMetadata); + metadata.add(dataLocaleMetadata); + } + if(defNewColumn.getLabel()==null&&!defNewColumn.getLabel().isEmpty()){ + String label=defNewColumn.getLabel(); + List texts=new ArrayList(); + texts.add(new ImmutableLocalizedText(label)); + NamesMetadata nameMetadata=new NamesMetadata(texts); + metadata.add(nameMetadata); } + if(metadata.size()>0){ + column_definition.put( + Constants.PARAMETER_EXTRACT_CODELIST_METADATA, + metadata); + } + TDText defaultValue = new TDText(defNewColumn.getDefaultValue()); column_definition.put( Constants.PARAMETER_EXTRACT_CODELIST_DEFAULT,