From cf82fe42aea9b5ac80969041a95bac1cd784e92f Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 10 Jun 2015 16:35:23 +0000 Subject: [PATCH] 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 --- .../user/td/gwtservice/server/TDGWTServiceImpl.java | 11 ++++++----- .../shared/uriresolver/UriResolverSession.java | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java index f341e96..cf05b4f 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java @@ -9453,24 +9453,25 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements try { // HttpSession session = this.getThreadLocalRequest().getSession(); ASLSession aslSession = SessionUtil.getAslSession(session); - + logger.debug("StartApplyTableRule: "+applyTableRuleSession); + SessionUtil .setApplyTableRuleSession(session, applyTableRuleSession); if (applyTableRuleSession == null) { - logger.error("Apply Table Rule Session is null"); + logger.error("Apply Table Rule Session is null: "); throw new TDGWTServiceException( "Error in apply rule on table: ApplyTableRuleSession is 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( "Error in apply rule on table: rule description is 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( "Error in apply rule on table: map is null"); } @@ -9494,7 +9495,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements RuleId ruleId = new RuleId(applyTableRuleSession .getRuleDescriptionData().getId()); - + Task trTask = service.applyTableRule(tabularResourceId, applyTableRuleSession.getPlaceHolderToColumnMap(), ruleId); logger.debug("Rules On Table Apply: TaskId " + trTask.getId()); diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/uriresolver/UriResolverSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/uriresolver/UriResolverSession.java index 4b842ae..469fae9 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/uriresolver/UriResolverSession.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/uriresolver/UriResolverSession.java @@ -28,6 +28,7 @@ public class UriResolverSession implements Serializable { this.uuid = uuid; this.applicationType = applicationType; this.fileName = null; + this.mimeType = null; } public UriResolverSession(String uuid, ApplicationType applicationType, @@ -36,6 +37,7 @@ public class UriResolverSession implements Serializable { this.uuid = uuid; this.applicationType = applicationType; this.fileName = fileName; + this.mimeType = mimeType; } public String getUuid() {