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@115382 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-06-15 11:51:33 +00:00
parent 546414f62f
commit 797428fcbe
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/BackgroundOperationMonitorCreator.java
View File

@ -39,7 +39,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.task.JobSClassifier;
import org.gcube.portlets.user.td.gwtservice.shared.task.TaskS; 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.TaskWrapper;
import org.gcube.portlets.user.td.gwtservice.shared.task.ValidationsJobS; import org.gcube.portlets.user.td.gwtservice.shared.task.ValidationsJobS;
import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabExportMetadata;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -56,8 +55,8 @@ public class BackgroundOperationMonitorCreator {
private static Logger logger = LoggerFactory private static Logger logger = LoggerFactory
.getLogger(BackgroundOperationMonitorCreator.class); .getLogger(BackgroundOperationMonitorCreator.class);
private static SimpleDateFormat sdf = new SimpleDateFormat( //private static SimpleDateFormat sdf = new SimpleDateFormat(
"yyyy-MM-dd HH:mm"); // "yyyy-MM-dd HH:mm");
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd"); private static SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
@ -281,13 +280,13 @@ public class BackgroundOperationMonitorCreator {
operationMonitor.setTrId(SessionUtil.getTRId(session)); operationMonitor.setTrId(SessionUtil.getTRId(session));
TabExportMetadata trExportMetadata; /*TabExportMetadata trExportMetadata;
trExportMetadata = new TabExportMetadata(); trExportMetadata = new TabExportMetadata();
trExportMetadata.setUrl(exportMetadata.getUri()); trExportMetadata.setUrl(exportMetadata.getUri());
trExportMetadata.setDestinationType(exportMetadata trExportMetadata.setDestinationType(exportMetadata
.getDestinationType()); .getDestinationType());
trExportMetadata.setExportDate(sdf.format(exportMetadata trExportMetadata.setExportDate(sdf.format(exportMetadata
.getExportDate())); .getExportDate()));*/
saveCSVExportInDestination(exportMetadata); saveCSVExportInDestination(exportMetadata);
break; break;
@ -306,12 +305,12 @@ public class BackgroundOperationMonitorCreator {
operationMonitor.setTrId(SessionUtil.getTRId(session)); operationMonitor.setTrId(SessionUtil.getTRId(session));
trExportMetadata = new TabExportMetadata(); /*trExportMetadata = new TabExportMetadata();
trExportMetadata.setUrl(exportMetadata.getUri()); trExportMetadata.setUrl(exportMetadata.getUri());
trExportMetadata.setDestinationType(exportMetadata trExportMetadata.setDestinationType(exportMetadata
.getDestinationType()); .getDestinationType());
trExportMetadata.setExportDate(sdf.format(exportMetadata trExportMetadata.setExportDate(sdf.format(exportMetadata
.getExportDate())); .getExportDate()));*/
saveJSONExportInDestination(exportMetadata); saveJSONExportInDestination(exportMetadata);
break; break;

15
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/monitor/OperationMonitorCreator.java
View File

@ -39,7 +39,6 @@ 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.TaskWrapper;
import org.gcube.portlets.user.td.gwtservice.shared.task.ValidationsJobS; import org.gcube.portlets.user.td.gwtservice.shared.task.ValidationsJobS;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource; import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
import org.gcube.portlets.user.td.gwtservice.shared.tr.table.metadata.TabExportMetadata;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -56,8 +55,8 @@ public class OperationMonitorCreator {
private static Logger logger = LoggerFactory private static Logger logger = LoggerFactory
.getLogger(OperationMonitorCreator.class); .getLogger(OperationMonitorCreator.class);
private static SimpleDateFormat sdf = new SimpleDateFormat( //private static SimpleDateFormat sdf = new SimpleDateFormat(
"yyyy-MM-dd HH:mm"); // "yyyy-MM-dd HH:mm");
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd"); private static SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
@ -262,7 +261,7 @@ public class OperationMonitorCreator {
TRId trId; TRId trId;
TabResource tabResource; TabResource tabResource;
Table table; Table table;
TabExportMetadata trExportMetadata; //TabExportMetadata trExportMetadata;
ExportMetadata exportMetadata; ExportMetadata exportMetadata;
switch (taskWrapper.getOperationId()) { switch (taskWrapper.getOperationId()) {
@ -274,12 +273,12 @@ public class OperationMonitorCreator {
operationMonitor.setTrId(SessionUtil.getTRId(session)); operationMonitor.setTrId(SessionUtil.getTRId(session));
trExportMetadata = new TabExportMetadata(); /*trExportMetadata = new TabExportMetadata();
trExportMetadata.setUrl(exportMetadata.getUri()); trExportMetadata.setUrl(exportMetadata.getUri());
trExportMetadata.setDestinationType(exportMetadata trExportMetadata.setDestinationType(exportMetadata
.getDestinationType()); .getDestinationType());
trExportMetadata.setExportDate(sdf.format(exportMetadata trExportMetadata.setExportDate(sdf.format(exportMetadata
.getExportDate())); .getExportDate()));*/
saveCSVExportInDestination(exportMetadata); saveCSVExportInDestination(exportMetadata);
break; break;
@ -298,12 +297,12 @@ public class OperationMonitorCreator {
operationMonitor.setTrId(SessionUtil.getTRId(session)); operationMonitor.setTrId(SessionUtil.getTRId(session));
trExportMetadata = new TabExportMetadata(); /*trExportMetadata = new TabExportMetadata();
trExportMetadata.setUrl(exportMetadata.getUri()); trExportMetadata.setUrl(exportMetadata.getUri());
trExportMetadata.setDestinationType(exportMetadata trExportMetadata.setDestinationType(exportMetadata
.getDestinationType()); .getDestinationType());
trExportMetadata.setExportDate(sdf.format(exportMetadata trExportMetadata.setExportDate(sdf.format(exportMetadata
.getExportDate())); .getExportDate()));*/
saveJSONExportInDestination(exportMetadata); saveJSONExportInDestination(exportMetadata);
break; break;