gCubeSystem
/
tabular-data-expression-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@91553 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-02-13 15:56:04 +00:00
parent ffe640fd49
commit 8742a7bdb9
2 changed files with 29 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/OperatorTypeMap.java
View File

@ -79,8 +79,7 @@ public class OperatorTypeMap {
case ANY: case ANY:
break; break;
case BEGINS_WITH: case BEGINS_WITH:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_TextBeginsWith(placeHolder,new TD_Value(dataType,firstArg));
exp=new C_TextBeginsWith(placeHolder,new C_ConstantList(arguments));
break; break;
case BETWEEN: case BETWEEN:
fArg=new TD_Value(dataType,firstArg); fArg=new TD_Value(dataType,firstArg);
@ -116,23 +115,19 @@ public class OperatorTypeMap {
case DIVISION: case DIVISION:
break; break;
case ENDS_WITH: case ENDS_WITH:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_TextEndsWith(placeHolder,new TD_Value(dataType,firstArg));
exp=new C_TextEndsWith(placeHolder,new C_ConstantList(arguments));
break; break;
case EQUALS: case EQUALS:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_Equals(placeHolder,new TD_Value(dataType,firstArg));
exp=new C_Equals(placeHolder,new C_ConstantList(arguments));
break; break;
case EXISTS: case EXISTS:
//exp=new C_Exi(placeHolder,new C_ConstantList(arguments)); //exp=new C_Exi(placeHolder,new C_ConstantList(arguments));
break; break;
case GREATER: case GREATER:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_GreaterThan(placeHolder,new TD_Value(dataType,firstArg));
exp=new C_GreaterThan(placeHolder,new C_ConstantList(arguments));
break; break;
case GREATER_OR_EQUALS: case GREATER_OR_EQUALS:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_GreaterOrEquals(placeHolder,new TD_Value(dataType,firstArg));
exp=new C_GreaterOrEquals(placeHolder,new C_ConstantList(arguments));
break; break;
case IN: case IN:
break; break;
@ -143,18 +138,15 @@ public class OperatorTypeMap {
exp=new C_IsNull(placeHolder); exp=new C_IsNull(placeHolder);
break; break;
case LESSER: case LESSER:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_LessThan(placeHolder,new TD_Value(dataType,firstArg));
exp=new C_LessThan(placeHolder,new C_ConstantList(arguments));
break; break;
case LESSER_OR_EQUALS: case LESSER_OR_EQUALS:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_LessOrEquals(placeHolder,new TD_Value(dataType,firstArg));
exp=new C_LessOrEquals(placeHolder,new C_ConstantList(arguments));
break; break;
case LIKE: case LIKE:
break; break;
case MATCH_REGEX: case MATCH_REGEX:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_TextMatchSQLRegexp(placeHolder,new TD_Value(dataType,firstArg));
exp=new C_TextMatchSQLRegexp(placeHolder,new C_ConstantList(arguments));
break; break;
case MODULUS: case MODULUS:
break; break;
@ -163,8 +155,7 @@ public class OperatorTypeMap {
case NOT: case NOT:
break; break;
case NOT_BEGINS_WITH: case NOT_BEGINS_WITH:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_TextBeginsWith(placeHolder, new TD_Value(dataType,firstArg));
exp=new C_TextBeginsWith(placeHolder,new C_ConstantList(arguments));
exp=new C_Not(exp); exp=new C_Not(exp);
break; break;
case NOT_BETWEEN: case NOT_BETWEEN:
@ -201,29 +192,24 @@ public class OperatorTypeMap {
exp=new C_Not(exp); exp=new C_Not(exp);
break; break;
case NOT_ENDS_WITH: case NOT_ENDS_WITH:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_TextEndsWith(placeHolder,new TD_Value(dataType,firstArg));
exp=new C_TextEndsWith(placeHolder,new C_ConstantList(arguments));
exp=new C_Not(exp); exp=new C_Not(exp);
break; break;
case NOT_EQUALS: case NOT_EQUALS:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_NotEquals(placeHolder,new TD_Value(dataType,firstArg));
exp=new C_NotEquals(placeHolder,new C_ConstantList(arguments));
break; break;
case NOT_GREATER: case NOT_GREATER:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_NotGreater(placeHolder,new TD_Value(dataType,firstArg));
exp=new C_NotGreater(placeHolder,new C_ConstantList(arguments));
break; break;
case NOT_IN: case NOT_IN:
break; break;
case NOT_LESSER: case NOT_LESSER:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_NotLess(placeHolder,new TD_Value(dataType,firstArg));
exp=new C_NotLess(placeHolder,new C_ConstantList(arguments));
break; break;
case NOT_LIKE: case NOT_LIKE:
break; break;
case NOT_MATCH_REGEX: case NOT_MATCH_REGEX:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_TextMatchSQLRegexp(placeHolder,new TD_Value(dataType,firstArg));
exp=new C_TextMatchSQLRegexp(placeHolder,new C_ConstantList(arguments));
exp=new C_Not(exp); exp=new C_Not(exp);
break; break;
case OR: case OR:
@ -267,8 +253,7 @@ public class OperatorTypeMap {
case ANY: case ANY:
break; break;
case BEGINS_WITH: case BEGINS_WITH:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_TextBeginsWith(columnReference,new TD_Value(dataType,firstArg));
exp=new C_TextBeginsWith(columnReference,new C_ConstantList(arguments));
break; break;
case BETWEEN: case BETWEEN:
fArg=new TD_Value(dataType,firstArg); fArg=new TD_Value(dataType,firstArg);
@ -304,23 +289,19 @@ public class OperatorTypeMap {
case DIVISION: case DIVISION:
break; break;
case ENDS_WITH: case ENDS_WITH:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_TextEndsWith(columnReference,new TD_Value(dataType,firstArg));
exp=new C_TextEndsWith(columnReference,new C_ConstantList(arguments));
break; break;
case EQUALS: case EQUALS:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_Equals(columnReference,new TD_Value(dataType,firstArg));
exp=new C_Equals(columnReference,new C_ConstantList(arguments));
break; break;
case EXISTS: case EXISTS:
//exp=new C_Exi(placeHolder,new C_ConstantList(arguments)); //exp=new C_Exi(placeHolder,new C_ConstantList(arguments));
break; break;
case GREATER: case GREATER:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_GreaterThan(columnReference,new TD_Value(dataType,firstArg));
exp=new C_GreaterThan(columnReference,new C_ConstantList(arguments));
break; break;
case GREATER_OR_EQUALS: case GREATER_OR_EQUALS:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_GreaterOrEquals(columnReference,new TD_Value(dataType,firstArg));
exp=new C_GreaterOrEquals(columnReference,new C_ConstantList(arguments));
break; break;
case IN: case IN:
break; break;
@ -331,18 +312,15 @@ public class OperatorTypeMap {
exp=new C_IsNull(columnReference); exp=new C_IsNull(columnReference);
break; break;
case LESSER: case LESSER:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_LessThan(columnReference,new TD_Value(dataType,firstArg));
exp=new C_LessThan(columnReference,new C_ConstantList(arguments));
break; break;
case LESSER_OR_EQUALS: case LESSER_OR_EQUALS:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_LessOrEquals(columnReference,new TD_Value(dataType,firstArg));
exp=new C_LessOrEquals(columnReference,new C_ConstantList(arguments));
break; break;
case LIKE: case LIKE:
break; break;
case MATCH_REGEX: case MATCH_REGEX:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_TextMatchSQLRegexp(columnReference,new TD_Value(dataType,firstArg));
exp=new C_TextMatchSQLRegexp(columnReference,new C_ConstantList(arguments));
break; break;
case MODULUS: case MODULUS:
break; break;
@ -351,8 +329,7 @@ public class OperatorTypeMap {
case NOT: case NOT:
break; break;
case NOT_BEGINS_WITH: case NOT_BEGINS_WITH:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_TextBeginsWith(columnReference,new TD_Value(dataType,firstArg));
exp=new C_TextBeginsWith(columnReference,new C_ConstantList(arguments));
exp=new C_Not(exp); exp=new C_Not(exp);
break; break;
case NOT_BETWEEN: case NOT_BETWEEN:
@ -389,29 +366,24 @@ public class OperatorTypeMap {
exp=new C_Not(exp); exp=new C_Not(exp);
break; break;
case NOT_ENDS_WITH: case NOT_ENDS_WITH:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_TextEndsWith(columnReference,new TD_Value(dataType,firstArg));
exp=new C_TextEndsWith(columnReference,new C_ConstantList(arguments));
exp=new C_Not(exp); exp=new C_Not(exp);
break; break;
case NOT_EQUALS: case NOT_EQUALS:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_NotEquals(columnReference,new TD_Value(dataType,firstArg));
exp=new C_NotEquals(columnReference,new C_ConstantList(arguments));
break; break;
case NOT_GREATER: case NOT_GREATER:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_NotGreater(columnReference,new TD_Value(dataType,firstArg));
exp=new C_NotGreater(columnReference,new C_ConstantList(arguments));
break; break;
case NOT_IN: case NOT_IN:
break; break;
case NOT_LESSER: case NOT_LESSER:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_NotLess(columnReference,new TD_Value(dataType,firstArg));
exp=new C_NotLess(columnReference,new C_ConstantList(arguments));
break; break;
case NOT_LIKE: case NOT_LIKE:
break; break;
case NOT_MATCH_REGEX: case NOT_MATCH_REGEX:
arguments.add(new TD_Value(dataType,firstArg)); exp=new C_TextMatchSQLRegexp(columnReference,new TD_Value(dataType,firstArg));
exp=new C_TextMatchSQLRegexp(columnReference,new C_ConstantList(arguments));
exp=new C_Not(exp); exp=new C_Not(exp);
break; break;
case OR: case OR:

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

@ -1,10 +1,8 @@
package org.gcube.portlets.user.td.expressionwidget.shared.model.leaf; package org.gcube.portlets.user.td.expressionwidget.shared.model.leaf;
import java.io.Serializable;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType;
public class TD_Value implements Serializable { public class TD_Value extends C_Leaf {
private static final long serialVersionUID = 2802022467528178596L; private static final long serialVersionUID = 2802022467528178596L;
protected String id="TD_Value"; protected String id="TD_Value";