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

Updated Denormalize 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@98399 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-07-03 16:11:43 +00:00
parent 8aab0d7033
commit 49147e7b72
4 changed files with 7 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,6 +17,7 @@ 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.CodelistMappingMonitor; import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingMonitor;
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;
@ -92,8 +93,8 @@ 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!");*/
/*
username = Constants.DEFAULT_USER; username = Constants.DEFAULT_USER;
String scope = Constants.DEFAULT_SCOPE; String scope = Constants.DEFAULT_SCOPE;
@ -101,7 +102,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);

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

@ -8270,7 +8270,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
DenormalizationSession denormalizationSession = SessionUtil DenormalizationSession denormalizationSession = SessionUtil
.getDenormalizationSession(session); .getDenormalizationSession(session);
Task task = SessionUtil.getNormalizationTask(session); Task task = SessionUtil.getDenormalizationTask(session);
DenormalizationMonitor denormalizationMonitor = new DenormalizationMonitor(); DenormalizationMonitor denormalizationMonitor = new DenormalizationMonitor();
if (task == null) { if (task == null) {

2
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ConditionCode.java
View File

@ -36,7 +36,7 @@ public enum ConditionCode {
private final int id; private final int id;
public int value() { public int getValue() {
return id; return id;
} }

2
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ConditionCodeMap.java
View File

@ -17,7 +17,7 @@ public class ConditionCodeMap {
public static ConditionCode mapConditionCode(int conditionCode) { public static ConditionCode mapConditionCode(int conditionCode) {
ConditionCode[] conditions=ConditionCode.values(); ConditionCode[] conditions=ConditionCode.values();
for(ConditionCode cond:conditions){ for(ConditionCode cond:conditions){
if(cond.value()==conditionCode){ if(cond.getValue()==conditionCode){
return cond; return cond;
} }
} }