Strabon

changeset 738:5b260cc9dc30

Now strdf:within will be used instead of strdf:inside
author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
date Mon Nov 26 14:17:56 2012 +0200 (2012-11-26)
parents 9110b919c347
children e52271f13b5a
files evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java
line diff
     1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java	Fri Nov 23 15:48:48 2012 +0200
     1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java	Mon Nov 26 14:17:56 2012 +0200
     1.3 @@ -20,6 +20,6 @@
     1.4  
     1.5  	@Override
     1.6  	public String getURI() {
     1.7 -		return GeoConstants.inside;
     1.8 +		return GeoConstants.within;
     1.9  	}
    1.10  }
     2.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java	Fri Nov 23 15:48:48 2012 +0200
     2.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java	Mon Nov 26 14:17:56 2012 +0200
     2.3 @@ -31,6 +31,7 @@
     2.4  import org.openrdf.query.algebra.Var;
     2.5  import org.openrdf.query.algebra.evaluation.function.Function;
     2.6  import org.openrdf.query.algebra.evaluation.function.FunctionRegistry;
     2.7 +import org.openrdf.query.algebra.evaluation.function.link.AddDateTimeFunc;
     2.8  import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
     2.9  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
    2.10  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
    2.11 @@ -142,13 +143,22 @@
    2.12  
    2.13  		if(right instanceof FunctionCall)
    2.14  		{
    2.15 +			System.out.println("FUNCTION:"+right.toString());
    2.16  			Function function = FunctionRegistry.getInstance().get(((FunctionCall)right).getURI());
    2.17  			if(function instanceof SpatialMetricFunc)
    2.18  			{
    2.19  				rightSql = spatialMetricFunction((FunctionCall) right, function);
    2.20  			}
    2.21 +			else if(((FunctionCall) right).getURI().toString().equalsIgnoreCase("http://example.org/custom-function/addDatetime"))
    2.22 +			{
    2.23 +				System.out.println("ADD DATE TIME FUNC!");
    2.24 +				FunctionRegistry fr =  FunctionRegistry.getInstance();
    2.25 +				Function f = fr.get("http://example.org/custom-function/addDatetime");
    2.26 +				if (f == null){System.out.println("COULD NOT GET DA FUNCTION!");}
    2.27 +			}
    2.28  			else //spatial property
    2.29  			{
    2.30 +				System.out.println("SPATIAL PROPERTY!!!");
    2.31  				rightSql = spatialPropertyFunction((FunctionCall) right, function);
    2.32  			}
    2.33  			rightIsSpatial = true;
    2.34 @@ -886,7 +896,7 @@
    2.35  		{
    2.36  			return equalsGeo(leftArg,rightArg);
    2.37  		}
    2.38 -		else if(function.getURI().equals(GeoConstants.inside))
    2.39 +		else if(function.getURI().equals(GeoConstants.within))
    2.40  		{
    2.41  			return inside(leftArg,rightArg);
    2.42  		}