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:
parent
6fbe320733
commit
2c940426d4
|
@ -2236,6 +2236,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
TabularDataService service = TabularDataServiceFactory.getService();
|
TabularDataService service = TabularDataServiceFactory.getService();
|
||||||
TabularResourceId tabularResourceId = new TabularResourceId(
|
TabularResourceId tabularResourceId = new TabularResourceId(
|
||||||
new Long(trId.getId()));
|
new Long(trId.getId()));
|
||||||
|
|
||||||
TabularResource tr = service.getTabularResource(tabularResourceId);
|
TabularResource tr = service.getTabularResource(tabularResourceId);
|
||||||
Table table = service.getLastTable(tabularResourceId);
|
Table table = service.getLastTable(tabularResourceId);
|
||||||
|
|
||||||
|
@ -6509,7 +6510,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
invocationS = new InvocationS(job.getInvocation()
|
invocationS = new InvocationS(job.getInvocation()
|
||||||
.getColumnId(), job.getInvocation()
|
.getColumnId(), job.getInvocation()
|
||||||
.getIdentifier(), job.getInvocation()
|
.getIdentifier(), job.getInvocation()
|
||||||
.getOperationId(), mapSent, refColumn);
|
.getOperationId(), mapSent, task.getId().getValue(),refColumn);
|
||||||
}
|
}
|
||||||
JobS jobS = new JobS(String.valueOf(j), job.getProgress(),
|
JobS jobS = new JobS(String.valueOf(j), job.getProgress(),
|
||||||
job.getHumaReadableStatus(), job.getDescription(),
|
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);
|
logger.error("Error in getConnection(): No TableDescriptorMetadata found for table "+table);
|
||||||
throw new TDGWTServiceException("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());
|
logger.debug("Table connect to tabular resource: "+tableDesc.getRefId());
|
||||||
TRId tId=new TRId(String.valueOf(tableDesc.getRefId()));
|
TRId tId=new TRId(String.valueOf(tableDesc.getRefId()));
|
||||||
TRId trId=retrieveTabularResourceBasicData(tId);
|
TRId trId=retrieveTabularResourceBasicData(tId);
|
||||||
|
|
|
@ -18,18 +18,21 @@ public class InvocationS implements Serializable {
|
||||||
protected long operationId;
|
protected long operationId;
|
||||||
protected Long identifier;
|
protected Long identifier;
|
||||||
protected Map<String, Object> parameters;
|
protected Map<String, Object> parameters;
|
||||||
|
protected String taskId;
|
||||||
protected RefColumn refColumn;
|
protected RefColumn refColumn;
|
||||||
|
|
||||||
|
|
||||||
public InvocationS() {
|
public InvocationS() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public InvocationS(String columnId, long operationId, Long identifier,
|
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.columnId = columnId;
|
||||||
this.operationId = operationId;
|
this.operationId = operationId;
|
||||||
this.identifier = identifier;
|
this.identifier = identifier;
|
||||||
this.parameters = parameters;
|
this.parameters = parameters;
|
||||||
|
this.taskId=taskId;
|
||||||
this.refColumn=refColumn;
|
this.refColumn=refColumn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,13 +76,23 @@ public class InvocationS implements Serializable {
|
||||||
this.refColumn = refColumn;
|
this.refColumn = refColumn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getTaskId() {
|
||||||
|
return taskId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTaskId(String taskId) {
|
||||||
|
this.taskId = taskId;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "InvocationS [columnId=" + columnId + ", operationId="
|
return "InvocationS [columnId=" + columnId + ", operationId="
|
||||||
+ operationId + ", identifier=" + identifier + ", parameters="
|
+ operationId + ", identifier=" + identifier + ", parameters="
|
||||||
+ parameters + ", refColumn=" + refColumn + "]";
|
+ parameters + ", taskId=" + taskId + ", refColumn="
|
||||||
|
+ refColumn + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue