Minor Update
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@99959 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
60997dd80c
commit
eb026f1a79
|
@ -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.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 +77,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 +88,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);
|
||||||
|
|
|
@ -15,34 +15,57 @@ public class ReplaceColumnByExpressionSession implements Serializable{
|
||||||
|
|
||||||
private static final long serialVersionUID = -3940140817918362233L;
|
private static final long serialVersionUID = -3940140817918362233L;
|
||||||
protected ColumnData column;
|
protected ColumnData column;
|
||||||
protected C_Expression cexpression;
|
protected C_Expression cConditionExpression;
|
||||||
|
protected C_Expression cReplaceExpression;
|
||||||
protected String replaceValue;
|
protected String replaceValue;
|
||||||
|
protected boolean useExpression;
|
||||||
|
|
||||||
public ReplaceColumnByExpressionSession(){
|
public ReplaceColumnByExpressionSession(){
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ReplaceColumnByExpressionSession(ColumnData column, C_Expression cexpression,
|
public ReplaceColumnByExpressionSession(ColumnData column, C_Expression cConditionExpression,
|
||||||
String replaceValue){
|
String replaceValue){
|
||||||
this.column=column;
|
this.column=column;
|
||||||
this.cexpression=cexpression;
|
this.cConditionExpression=cConditionExpression;
|
||||||
this.replaceValue=replaceValue;
|
this.replaceValue=replaceValue;
|
||||||
|
this.useExpression=false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ReplaceColumnByExpressionSession(ColumnData column, C_Expression cConditionExpression,
|
||||||
|
C_Expression cReplaceExpression){
|
||||||
|
this.column=column;
|
||||||
|
this.cConditionExpression=cConditionExpression;
|
||||||
|
this.cReplaceExpression=cReplaceExpression;
|
||||||
|
this.useExpression=false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public ColumnData getColumn() {
|
public ColumnData getColumn() {
|
||||||
return column;
|
return column;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setColumn(ColumnData column) {
|
public void setColumn(ColumnData column) {
|
||||||
this.column = column;
|
this.column = column;
|
||||||
}
|
}
|
||||||
public C_Expression getCexpression() {
|
|
||||||
return cexpression;
|
public C_Expression getcConditionExpression() {
|
||||||
|
return cConditionExpression;
|
||||||
}
|
}
|
||||||
public void setCexpression(C_Expression cexpression) {
|
|
||||||
this.cexpression = cexpression;
|
public void setcConditionExpression(C_Expression cConditionExpression) {
|
||||||
|
this.cConditionExpression = cConditionExpression;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public C_Expression getcReplaceExpression() {
|
||||||
|
return cReplaceExpression;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setcReplaceExpression(C_Expression cReplaceExpression) {
|
||||||
|
this.cReplaceExpression = cReplaceExpression;
|
||||||
|
}
|
||||||
|
|
||||||
public String getReplaceValue() {
|
public String getReplaceValue() {
|
||||||
return replaceValue;
|
return replaceValue;
|
||||||
}
|
}
|
||||||
|
@ -51,12 +74,23 @@ public class ReplaceColumnByExpressionSession implements Serializable{
|
||||||
this.replaceValue = replaceValue;
|
this.replaceValue = replaceValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isUseExpression() {
|
||||||
|
return useExpression;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUseExpression(boolean useExpression) {
|
||||||
|
this.useExpression = useExpression;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "ReplaceColumnByExpressionSession [column=" + column
|
return "ReplaceColumnByExpressionSession [column=" + column
|
||||||
+ ", cexpression=" + cexpression + ", replaceValue="
|
+ ", cConditionExpression=" + cConditionExpression
|
||||||
+ replaceValue + "]";
|
+ ", cReplaceExpression=" + cReplaceExpression
|
||||||
|
+ ", replaceValue=" + replaceValue + ", useExpression="
|
||||||
|
+ useExpression + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,8 +21,8 @@ import org.junit.Test;
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class TestServiceTable {
|
public class TestServiceTable {
|
||||||
private final static long trId = 264;
|
private final static long trId = 157;
|
||||||
private final static long searchTableId=693;
|
private final static long searchTableId=1951;
|
||||||
private String user=Constants.DEFAULT_USER;
|
private String user=Constants.DEFAULT_USER;
|
||||||
private String scope=Constants.DEFAULT_SCOPE;
|
private String scope=Constants.DEFAULT_SCOPE;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue