Revision 44134

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/function/operator/ConcatOperator.java
1
package org.gvsig.expressionevaluator.impl.function.operator;
2

  
3
import java.util.Objects;
4
import org.gvsig.expressionevaluator.Function;
5
import org.gvsig.expressionevaluator.Interpreter;
6

  
7
public class ConcatOperator extends AbstractBinaryOperator {
8

  
9
    public ConcatOperator() {
10
        super(Function.GROUP_STRING, "||");     
11
    }
12

  
13
    @Override
14
    public boolean allowConstantFolding() {
15
        return true;
16
    }
17
    
18
    @Override
19
    public Object call(Interpreter interpreter, Object op1, Object op2) {     
20
        return Objects.toString(op1,"")+Objects.toString(op2, "");
21
    }
22
    
23
}
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/symboltable/SQLSymbolTable.java
51 51
import org.gvsig.expressionevaluator.impl.function.operator.NegOperator;
52 52
import org.gvsig.expressionevaluator.impl.function.operator.NotOperator;
53 53
import org.gvsig.expressionevaluator.impl.function.operator.OrOperator;
54
import org.gvsig.expressionevaluator.impl.function.operator.RegExpOperator;
54 55
import org.gvsig.expressionevaluator.impl.function.operator.SubstOperator;
55 56
import org.gvsig.expressionevaluator.impl.function.predicate.IlikeOperator;
56 57
import org.gvsig.expressionevaluator.impl.function.predicate.LikeOperator;
......
108 109
        
109 110
        this.addOperator(new IlikeOperator());
110 111
        this.addOperator(new LikeOperator());
112
        this.addOperator(new RegExpOperator());
111 113
        this.addOperator(new NegOperator());
112 114
        
113 115
        this.addFunction(new ACosFunction());
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/resources/org/gvsig/expressionevaluator/functions/en/ST_Overlaps.json
1 1
{
2 2
    "name": "ST_Overlaps",
3 3
    "group": "OGC",
4
    "template": "ST_Overlaps({{geometryA}}, geometryB)",
4
    "template": "ST_Overlaps({{geometry}}, geometryB)",
5 5
    "args": [
6
        "geometryA - Geometry from which you have to calculate the intersection",
6
        "geometry - Geometry from which you have to calculate the intersection",
7 7
        "geometryB - Geometry againt you have to calculate the intersection"
8 8
    ],
9 9
    "description": ["Returns TRUE if the Geometries 'spatially overlap'. By that we mean they intersect, but one does not completely contain another."],
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/resources/org/gvsig/expressionevaluator/functions/en/ST_X.json
1 1
{
2 2
    "name": "ST_X",
3 3
    "group": "OGC",
4
    "template": "ST_X({{point}})",
4
    "template": "ST_X({{geometry}})",
5 5
    "args": [
6
        "point - Geometry point from which you have to calculate "
6
        "geometry - Geometry point from which you have to calculate "
7 7
    ],
8 8
    "description": "Return the X coordinate of the point.",
9 9
    "returnType": "Double",
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/resources/org/gvsig/expressionevaluator/functions/en/ST_Y.json
1 1
{
2 2
    "name": "ST_Y",
3 3
    "group": "OGC",
4
    "template": "ST_Y({{point}})",
4
    "template": "ST_Y({{geometry}})",
5 5
    "args": [
6
        "point - Geometry point from which you have to calculate "
6
        "geometry - Geometry point from which you have to calculate "
7 7
    ],
8 8
    "description": "Return the Y coordinate of the point.",
9 9
    "returnType": "Double",
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/resources/org/gvsig/expressionevaluator/functions/en/ST_Z.json
1 1
{
2 2
    "name": "ST_Z",
3 3
    "group": "OGC",
4
    "template": "ST_Z({{point}})",
4
    "template": "ST_Z({{geometry}})",
5 5
    "args": [
6
        "point - Geometry point from which you have to calculate "
6
        "geometry - Geometry point from which you have to calculate "
7 7
    ],
8 8
    "description": "Return the Z coordinate of the point.",
9 9
    "returnType": "Double",

Also available in: Unified diff