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

81: TDM - Allow the creation and use of expressions on multi column in TDM portlet 

Task-Url: https://support.d4science.org/issues/81

Updated Rules On Table

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@115308 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-06-10 16:35:23 +00:00
parent a78876c569
commit cf82fe42ae
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9453,24 +9453,25 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
try { try {
// HttpSession session = this.getThreadLocalRequest().getSession(); // HttpSession session = this.getThreadLocalRequest().getSession();
ASLSession aslSession = SessionUtil.getAslSession(session); ASLSession aslSession = SessionUtil.getAslSession(session);
logger.debug("StartApplyTableRule: "+applyTableRuleSession);
SessionUtil SessionUtil
.setApplyTableRuleSession(session, applyTableRuleSession); .setApplyTableRuleSession(session, applyTableRuleSession);
if (applyTableRuleSession == null) { if (applyTableRuleSession == null) {
logger.error("Apply Table Rule Session is null"); logger.error("Apply Table Rule Session is null: ");
throw new TDGWTServiceException( throw new TDGWTServiceException(
"Error in apply rule on table: ApplyTableRuleSession is null"); "Error in apply rule on table: ApplyTableRuleSession is null");
} }
if (applyTableRuleSession.getRuleDescriptionData() == null) { if (applyTableRuleSession.getRuleDescriptionData() == null) {
logger.error("Apply Table Rule Session: RuleDescriptionData is null"); logger.error("Apply Table Rule Session: RuleDescriptionData is null: "+applyTableRuleSession);
throw new TDGWTServiceException( throw new TDGWTServiceException(
"Error in apply rule on table: rule description is null"); "Error in apply rule on table: rule description is null");
} }
if (applyTableRuleSession.getPlaceHolderToColumnMap() == null) { if (applyTableRuleSession.getPlaceHolderToColumnMap() == null) {
logger.error("Apply Table Rule Session: PlaceHolderToColumnMap is null"); logger.error("Apply Table Rule Session: PlaceHolderToColumnMap is null: "+applyTableRuleSession);
throw new TDGWTServiceException( throw new TDGWTServiceException(
"Error in apply rule on table: map is null"); "Error in apply rule on table: map is null");
} }
@ -9494,7 +9495,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
RuleId ruleId = new RuleId(applyTableRuleSession RuleId ruleId = new RuleId(applyTableRuleSession
.getRuleDescriptionData().getId()); .getRuleDescriptionData().getId());
Task trTask = service.applyTableRule(tabularResourceId, Task trTask = service.applyTableRule(tabularResourceId,
applyTableRuleSession.getPlaceHolderToColumnMap(), ruleId); applyTableRuleSession.getPlaceHolderToColumnMap(), ruleId);
logger.debug("Rules On Table Apply: TaskId " + trTask.getId()); logger.debug("Rules On Table Apply: TaskId " + trTask.getId());

2
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/uriresolver/UriResolverSession.java
View File

@ -28,6 +28,7 @@ public class UriResolverSession implements Serializable {
this.uuid = uuid; this.uuid = uuid;
this.applicationType = applicationType; this.applicationType = applicationType;
this.fileName = null; this.fileName = null;
this.mimeType = null;
} }
public UriResolverSession(String uuid, ApplicationType applicationType, public UriResolverSession(String uuid, ApplicationType applicationType,
@ -36,6 +37,7 @@ public class UriResolverSession implements Serializable {
this.uuid = uuid; this.uuid = uuid;
this.applicationType = applicationType; this.applicationType = applicationType;
this.fileName = fileName; this.fileName = fileName;
this.mimeType = mimeType;
} }
public String getUuid() { public String getUuid() {