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

Updated PeriodType 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@101093 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-10-28 16:34:14 +00:00
parent ae888c2c08
commit bd28d29f1c
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4TimeAggregation.java
View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationDefinition; import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationDefinition;
import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationExecution; import org.gcube.data.analysis.tabulardata.commons.webservice.types.operations.OperationExecution;
import org.gcube.data.analysis.tabulardata.model.column.ColumnLocalId;
import org.gcube.data.analysis.tabulardata.service.TabularDataService; import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap; import org.gcube.portlets.user.td.gwtservice.server.trservice.OperationDefinitionMap;
import org.gcube.portlets.user.td.gwtservice.shared.OperationsId; import org.gcube.portlets.user.td.gwtservice.shared.OperationsId;
@ -40,18 +41,19 @@ public class OpExecution4TimeAggregation extends OpExecutionBuilder {
logger.debug(timeAggregationSession.toString()); logger.debug(timeAggregationSession.toString());
OperationDefinition operationDefinition; OperationDefinition operationDefinition;
HashMap<String,Object> map=timeAggregationSession.getMap(); HashMap<String, Object> map = timeAggregationSession.getMap();
if(map==null){ if (map == null) {
logger.error("In TimeAggregationSession map is null"); logger.error("In TimeAggregationSession map is null");
throw new TDGWTServiceException("In TimeAggregationSession map is null"); throw new TDGWTServiceException(
"In TimeAggregationSession map is null");
} }
operationDefinition = OperationDefinitionMap.map( operationDefinition = OperationDefinitionMap.map(
OperationsId.TimeAggregation.toString(), service); OperationsId.TimeAggregation.toString(), service);
invocation = new OperationExecution( invocation = new OperationExecution(timeAggregationSession.getColumn()
operationDefinition.getOperationId(), map); .getColumnId(), operationDefinition.getOperationId(), map);
operationExecutionSpec.setOp(invocation); operationExecutionSpec.setOp(invocation);

27
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/groupby/TimeAggregationSession.java
View File

@ -3,6 +3,7 @@ package org.gcube.portlets.user.td.gwtservice.shared.tr.groupby;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
/** /**
@ -13,17 +14,27 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
*/ */
public class TimeAggregationSession implements Serializable { public class TimeAggregationSession implements Serializable {
private static final long serialVersionUID = -1896235499708614266L; private static final long serialVersionUID = 7297177399486247575L;
protected TRId trId; protected TRId trId;
protected ColumnData column;
protected HashMap<String, Object> map; protected HashMap<String, Object> map;
public TimeAggregationSession() { public TimeAggregationSession() {
} }
public TimeAggregationSession(TRId trId, HashMap<String, Object> map) { /**
*
* @param trId
* @param column
* @param map
*/
public TimeAggregationSession(TRId trId, ColumnData column,
HashMap<String, Object> map) {
super();
this.trId = trId; this.trId = trId;
this.column = column;
this.map = map; this.map = map;
} }
@ -35,6 +46,14 @@ public class TimeAggregationSession implements Serializable {
this.trId = trId; this.trId = trId;
} }
public ColumnData getColumn() {
return column;
}
public void setColumn(ColumnData column) {
this.column = column;
}
public HashMap<String, Object> getMap() { public HashMap<String, Object> getMap() {
return map; return map;
} }
@ -45,8 +64,8 @@ public class TimeAggregationSession implements Serializable {
@Override @Override
public String toString() { public String toString() {
return "TimeAggregationSession [trId=" + trId + ", map=" + map + "]"; return "TimeAggregationSession [trId=" + trId + ", column=" + column
+ ", map=" + map + "]";
} }
} }