git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@114377 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java

@@ -60,7 +60,7 @@ import com.sencha.gxt.widget.core.client.info.Info;
  */
 public class ColumnExpressionPanel extends FramedPanel {
 	private static final String RULE_DESCRIPTION_HEIGHT = "44px";
-	private static final String RULE_PLACE_HOLDER_ID = "RulePlaceHolderId";
+	private static final String RULE_PLACE_HOLDER_ID = "Column";
 
 	private enum ColumnExpressionPanelType {
 		MultiColumnFilter, ColumnFilter, RowDeleteByExpression, Template, Rule;

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextMatchSQLRegexp.java

@@ -24,7 +24,7 @@ public class C_TextMatchSQLRegexp extends C_Expression {
 		this.leftArgument = leftArgument;
 		this.rightArgument = rightArgument;
 		if (leftArgument != null && rightArgument != null) {
-			this.readableExpression = "TextMatchSQLRegexp("
+			this.readableExpression = "Match("
 					+ leftArgument.getReadableExpression() + ","
 					+ rightArgument.getReadableExpression() + ")";
 		}

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextReplaceMatchingRegex.java

@@ -31,7 +31,7 @@ public class C_TextReplaceMatchingRegex extends C_Expression {
 		this.regexp = regexp;
 		this.replacing = replacing;
 		if (toCheckText != null && regexp != null && replacing != null) {
-			this.readableExpression = "TextReplaceMatchingRegex("
+			this.readableExpression = "ReplaceByExpression("
 					+ toCheckText.getReadableExpression() + ","
 					+ regexp.getReadableExpression() + ","
 					+ replacing.getReadableExpression() + ")";

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ColumnReferencePlaceholder.java

@@ -17,9 +17,8 @@ public class C_ColumnReferencePlaceholder extends C_Leaf {
 		this.dataType = dataType;
 		this.columnId = columnId;
 		if (dataType != null && columnId != null) {
-			this.readableExpression = "PlaceHolder("
-					+ dataType.getColumnDataTypeLabel() +
-					"," + columnId + ")";
+			this.readableExpression = "$"+columnId+"["
+					+ dataType.getColumnDataTypeLabel() + "]";
 		}
 
 	}

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/TD_Value.java

@@ -17,8 +17,26 @@ public class TD_Value extends C_Leaf {
 		this.valueType = valueType;
 		this.value = value;
 		if (valueType != null) {
-			this.readableExpression = "TDValue("
-					+ valueType.getColumnDataTypeLabel() + "," + value + ")";
+			switch(valueType){
+			case Boolean:
+			case Date:
+			case Geometry:
+			case Integer:
+			case Numeric:
+				this.readableExpression =  value;
+				break;
+			case Text:
+				this.readableExpression = "\""+ value + "\"";
+				break;
+			default:
+				this.readableExpression = "";
+				break;
+			
+			}
+			
+			
+		} else {
+			this.readableExpression = "InvalidType";
 		}
 
 	}