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
This commit is contained in:
parent
2513cc3cce
commit
246880a45d
|
@ -2,13 +2,18 @@ package org.gcube.portlets.user.td.gwtservice.server.trservice;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.gcube.data.analysis.tabulardata.model.column.ColumnLocalId;
|
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.ColumnReference;
|
||||||
import org.gcube.data.analysis.tabulardata.model.column.ColumnType;
|
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.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.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.data.analysis.tabulardata.model.table.TableId;
|
||||||
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
|
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
|
||||||
import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistSession;
|
import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistSession;
|
||||||
|
@ -65,15 +70,28 @@ public class ExtractCodelistOperationMap {
|
||||||
column_definition.put(
|
column_definition.put(
|
||||||
Constants.PARAMETER_EXTRACT_CODELIST_COLUMN_TYPE,
|
Constants.PARAMETER_EXTRACT_CODELIST_COLUMN_TYPE,
|
||||||
columnType);
|
columnType);
|
||||||
|
|
||||||
|
ArrayList<ColumnMetadata> metadata=new ArrayList<ColumnMetadata>();
|
||||||
|
|
||||||
if (columnTypeCode == ColumnTypeCode.CODENAME) {
|
if (columnTypeCode == ColumnTypeCode.CODENAME) {
|
||||||
DataLocaleMetadata dataLocaleMetadata = new DataLocaleMetadata(
|
DataLocaleMetadata dataLocaleMetadata = new DataLocaleMetadata(
|
||||||
defNewColumn.getLocaleName());
|
defNewColumn.getLocaleName());
|
||||||
column_definition.put(
|
metadata.add(dataLocaleMetadata);
|
||||||
Constants.PARAMETER_EXTRACT_CODELIST_METADATA,
|
}
|
||||||
dataLocaleMetadata);
|
if(defNewColumn.getLabel()==null&&!defNewColumn.getLabel().isEmpty()){
|
||||||
|
String label=defNewColumn.getLabel();
|
||||||
|
List<LocalizedText> texts=new ArrayList<LocalizedText>();
|
||||||
|
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());
|
TDText defaultValue = new TDText(defNewColumn.getDefaultValue());
|
||||||
column_definition.put(
|
column_definition.put(
|
||||||
Constants.PARAMETER_EXTRACT_CODELIST_DEFAULT,
|
Constants.PARAMETER_EXTRACT_CODELIST_DEFAULT,
|
||||||
|
|
Loading…
Reference in New Issue