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

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@95879 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-05-21 09:11:34 +00:00
parent 6fbe320733
commit 2c940426d4
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2236,6 +2236,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
TabularDataService service = TabularDataServiceFactory.getService();
TabularResourceId tabularResourceId = new TabularResourceId(
new Long(trId.getId()));
TabularResource tr = service.getTabularResource(tabularResourceId);
Table table = service.getLastTable(tabularResourceId);
@ -6509,7 +6510,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
invocationS = new InvocationS(job.getInvocation()
.getColumnId(), job.getInvocation()
.getIdentifier(), job.getInvocation()
.getOperationId(), mapSent, refColumn);
.getOperationId(), mapSent, task.getId().getValue(),refColumn);
}
JobS jobS = new JobS(String.valueOf(j), job.getProgress(),
job.getHumaReadableStatus(), job.getDescription(),
@ -6708,7 +6709,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
logger.error("Error in getConnection(): No TableDescriptorMetadata found for table "+table);
throw new TDGWTServiceException("Error in getConnection(): No TableDescriptorMetadata found for table "+table);
}
if(tableDesc.getRefId()==0){
logger.error("Error refId=0 for Table:"+table.toString());
throw new TDGWTServiceException("Error refId=0 for Table:"+table.toString());
}
logger.debug("Table connect to tabular resource: "+tableDesc.getRefId());
TRId tId=new TRId(String.valueOf(tableDesc.getRefId()));
TRId trId=retrieveTabularResourceBasicData(tId);

17
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/task/InvocationS.java
View File

@ -18,18 +18,21 @@ public class InvocationS implements Serializable {
protected long operationId;
protected Long identifier;
protected Map<String, Object> parameters;
protected String taskId;
protected RefColumn refColumn;
public InvocationS() {
}
public InvocationS(String columnId, long operationId, Long identifier,
Map<String, Object> parameters, RefColumn refColumn) {
Map<String, Object> parameters, String taskId, RefColumn refColumn) {
this.columnId = columnId;
this.operationId = operationId;
this.identifier = identifier;
this.parameters = parameters;
this.taskId=taskId;
this.refColumn=refColumn;
}
@ -72,14 +75,24 @@ public class InvocationS implements Serializable {
public void setRefColumn(RefColumn refColumn) {
this.refColumn = refColumn;
}
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
@Override
public String toString() {
return "InvocationS [columnId=" + columnId + ", operationId="
+ operationId + ", identifier=" + identifier + ", parameters="
+ parameters + ", refColumn=" + refColumn + "]";
+ parameters + ", taskId=" + taskId + ", refColumn="
+ refColumn + "]";
}
}