Minor Update
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@99437 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
b31f8630f0
commit
4b965e266a
|
@ -1619,7 +1619,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
|||
.getMetadata(ValidSinceMetadata.class);
|
||||
if (validSinceMeta != null && validSinceMeta.getValue() != null) {
|
||||
Calendar validSinceC=validSinceMeta.getValue();
|
||||
t.setValidFrom(sdfDate.format(validSinceC));
|
||||
t.setValidFrom(sdfDate.format(validSinceC.getTime()));
|
||||
} else {
|
||||
|
||||
}
|
||||
|
@ -1632,7 +1632,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
|||
.getMetadata(ValidUntilMetadata.class);
|
||||
if (validUntilMeta != null && validUntilMeta.getValue() != null) {
|
||||
Calendar validUntilC=validUntilMeta.getValue();
|
||||
t.setValidUntilTo(sdfDate.format(validUntilC));
|
||||
t.setValidUntilTo(sdfDate.format(validUntilC.getTime()));
|
||||
} else {
|
||||
|
||||
}
|
||||
|
|
|
@ -15,6 +15,7 @@ import org.gcube.data.analysis.tabulardata.model.table.Table;
|
|||
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
|
||||
import org.gcube.data.analysis.tabulardata.service.impl.TabularDataServiceFactory;
|
||||
import org.gcube.data.analysis.tabulardata.service.operation.Job;
|
||||
import org.gcube.data.analysis.tabulardata.service.operation.Task;
|
||||
import org.gcube.data.analysis.tabulardata.service.operation.ValidationJob;
|
||||
import org.gcube.data.analysis.tabulardata.service.tabular.TabularResource;
|
||||
import org.gcube.data.analysis.tabulardata.service.tabular.TabularResourceId;
|
||||
|
@ -26,6 +27,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession;
|
|||
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
|
||||
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
|
||||
import org.gcube.portlets.user.td.gwtservice.shared.task.JobS;
|
||||
import org.gcube.portlets.user.td.gwtservice.shared.task.State;
|
||||
import org.gcube.portlets.user.td.gwtservice.shared.task.TaskS;
|
||||
import org.gcube.portlets.user.td.gwtservice.shared.task.TaskWrapper;
|
||||
import org.gcube.portlets.user.td.gwtservice.shared.task.ValidationsJobS;
|
||||
|
@ -90,9 +92,16 @@ public class OperationMonitorCreator {
|
|||
throw new TDGWTServiceException(
|
||||
"Error in Operation Monitor task is null");
|
||||
} else {
|
||||
operationMonitor
|
||||
.setTaskId(taskWrapper.getTask().getId().getValue());
|
||||
operationMonitor.setTaskId(taskWrapper.getTask().getId()
|
||||
.getValue());
|
||||
|
||||
if (operationMonitorSession.isAbort()) {
|
||||
Task task = taskWrapper.getTask();
|
||||
task.abort();
|
||||
TaskS taskS = createTaskS();
|
||||
taskS.setState(State.ABORTED);
|
||||
operationMonitor.setTask(taskS);
|
||||
} else {
|
||||
TaskStatus status = taskWrapper.getTask().getStatus();
|
||||
if (status == null) {
|
||||
logger.debug("Services TaskStatus : null");
|
||||
|
@ -102,6 +111,8 @@ public class OperationMonitorCreator {
|
|||
TaskS taskS = createTaskS();
|
||||
operationMonitor.setTask(taskS);
|
||||
}
|
||||
|
||||
}
|
||||
SessionUtil.setTaskStarted(session, taskWrapper);
|
||||
postOperation(operationMonitor);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue