gCubeSystem
/
tabular-data-gwt-service
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor updated 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@86430 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2013-12-02 14:53:13 +00:00
parent 5c7d228a32
commit 9e2f87c89b
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
View File

@ -40,7 +40,6 @@ import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.data.analysis.tabulardata.operation.OperationDescriptor;
import org.gcube.data.analysis.tabulardata.operation.invocation.InvocationCreator;
import org.gcube.data.analysis.tabulardata.operation.invocation.OperationInvocation;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.data.analysis.tabulardata.service.exception.InvalidTabularResourceException;
import org.gcube.data.analysis.tabulardata.service.exception.NoSuchTabularResourceException;
@ -103,7 +102,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabVersion
import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Agencies;
import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Codelist;
import org.gcube.portlets.user.td.gwtservice.shared.tr.type.Dataset;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -1480,17 +1478,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
parameterInstances.put(Constants.ENCODING, exportSession.getEncoding());
parameterInstances.put(Constants.SEPARATOR,
exportSession.getSeparator());
parameterInstances.put(Constants.COLUMNS, exportSession.getColumns());
// TODO
/*
* List<String> columns = Lists.newArrayList(); for(Column column :
* table.getColumns()) if (!(column.getColumnType() instanceof
* IdColumnType)) columns.add(column.getName());
*
* instances.put(Constants.COLUMNS, columns);
*/
parameterInstances.put(Constants.COLUMNS, exportSession.getColumnsAsString());
return parameterInstances;
}
@ -1536,7 +1524,6 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
List<OperationDescriptor> capabilities = service.getCapabilities();
// Export CSV file
OperationDescriptor exportCSVFileOperation = getOperationDescriptorWithId(
OperationsId.CSVExport.toString(), capabilities);
@ -1617,7 +1604,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
trExportMetadata.setExportDate(sdf
.format(exportMetadata.getExportDate()));
exportMonitor.setTrExportMetadata(trExportMetadata);
break;
case IN_PROGRESS:
exportMonitor.setProgress(task.getProgress());

9
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/csv/CSVExportSession.java
View File

@ -38,6 +38,15 @@ public class CSVExportSession implements Serializable {
public void setColumns(ArrayList<ColumnData> columns) {
this.columns = columns;
}
public ArrayList<String> getColumnsAsString(){
ArrayList<String> columnsAsString=new ArrayList<String>();
for(ColumnData cData: columns){
columnsAsString.add(cData.getName());
}
return columnsAsString;
}
public String getEncoding() {
return encoding;
}