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

Updated OperationMonitor 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@99352 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-08-29 17:31:26 +00:00
parent 17798de7f9
commit 2c6fe8920e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
View File

@ -17,7 +17,6 @@ import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
import org.gcube.portlets.user.td.gwtservice.server.file.CSVFileUploadSession; import org.gcube.portlets.user.td.gwtservice.server.file.CSVFileUploadSession;
import org.gcube.portlets.user.td.gwtservice.server.file.CodelistMappingFileUploadSession; import org.gcube.portlets.user.td.gwtservice.server.file.CodelistMappingFileUploadSession;
import org.gcube.portlets.user.td.gwtservice.server.trservice.TRTasksManager; import org.gcube.portlets.user.td.gwtservice.server.trservice.TRTasksManager;
import org.gcube.portlets.user.td.gwtservice.shared.Constants;
import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession; import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession;
import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession;
import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession;
@ -76,10 +75,10 @@ public class SessionUtil {
ASLSession session; ASLSession session;
if (username == null) { if (username == null) {
logger.warn("no user found in session, using test one"); logger.warn("no user found in session, using test one");
/* throw new TDGWTSessionExpiredException("Session Expired!"); */ throw new TDGWTSessionExpiredException("Session Expired!");
// Remove comment for Test // Remove comment for Test
/*
username = Constants.DEFAULT_USER; username = Constants.DEFAULT_USER;
String scope = Constants.DEFAULT_SCOPE; String scope = Constants.DEFAULT_SCOPE;
@ -87,7 +86,7 @@ public class SessionUtil {
session = SessionManager.getInstance().getASLSession( session = SessionManager.getInstance().getASLSession(
httpSession.getId(), username); httpSession.getId(), username);
session.setScope(scope); session.setScope(scope);
*/
} else { } else {
session = SessionManager.getInstance().getASLSession( session = SessionManager.getInstance().getASLSession(
httpSession.getId(), username); httpSession.getId(), username);

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

@ -119,13 +119,13 @@ public class OperationMonitorCreator {
ArrayList<ValidationsJobS> validationsJobS = new ArrayList<ValidationsJobS>(); ArrayList<ValidationsJobS> validationsJobS = new ArrayList<ValidationsJobS>();
int j = 1; int j = 1;
for (ValidationJob valJob : job.getValidationJobs()) { for (ValidationJob valJob : job.getValidationJobs()) {
ValidationsJobS validationJ = new ValidationsJobS( ValidationsJobS validationJ = new ValidationsJobS(
String.valueOf(j), WorkerStateMap.map(valJob String.valueOf(j), WorkerStateMap.map(valJob
.getStatus()), valJob.getProgress(), .getStatus()), valJob.getProgress(),
valJob.getDescription(), valJob.getErrorMessage(), valJob.getDescription(), valJob.getErrorMessage(),
valJob.getHumaReadableStatus()); valJob.getHumaReadableStatus());
validationsJobS.add(validationJ); validationsJobS.add(validationJ);
j++;
} }
JobS jobS = new JobS(String.valueOf(i), job.getProgress(), JobS jobS = new JobS(String.valueOf(i), job.getProgress(),
@ -134,7 +134,7 @@ public class OperationMonitorCreator {
validationsJobS); validationsJobS);
jobSList.add(jobS); jobSList.add(jobS);
j++; i++;
} }