# HG changeset patch
# User Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
# Date 1353932276 -7200
# Node ID 5b260cc9dc302c89923a2069e5d0aa54a5d0d798
# Parent  9110b919c34707952db5c87bcd5e839645d3a882
Now strdf:within will be used instead of strdf:inside

diff -r 9110b919c347 -r 5b260cc9dc30 evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java
--- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java	Fri Nov 23 15:48:48 2012 +0200
+++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java	Mon Nov 26 14:17:56 2012 +0200
@@ -20,6 +20,6 @@
 
 	@Override
 	public String getURI() {
-		return GeoConstants.inside;
+		return GeoConstants.within;
 	}
 }
diff -r 9110b919c347 -r 5b260cc9dc30 generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java
--- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java	Fri Nov 23 15:48:48 2012 +0200
+++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java	Mon Nov 26 14:17:56 2012 +0200
@@ -31,6 +31,7 @@
 import org.openrdf.query.algebra.Var;
 import org.openrdf.query.algebra.evaluation.function.Function;
 import org.openrdf.query.algebra.evaluation.function.FunctionRegistry;
+import org.openrdf.query.algebra.evaluation.function.link.AddDateTimeFunc;
 import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc;
 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialMetricFunc;
@@ -142,13 +143,22 @@
 
 		if(right instanceof FunctionCall)
 		{
+			System.out.println("FUNCTION:"+right.toString());
 			Function function = FunctionRegistry.getInstance().get(((FunctionCall)right).getURI());
 			if(function instanceof SpatialMetricFunc)
 			{
 				rightSql = spatialMetricFunction((FunctionCall) right, function);
 			}
+			else if(((FunctionCall) right).getURI().toString().equalsIgnoreCase("http://example.org/custom-function/addDatetime"))
+			{
+				System.out.println("ADD DATE TIME FUNC!");
+				FunctionRegistry fr =  FunctionRegistry.getInstance();
+				Function f = fr.get("http://example.org/custom-function/addDatetime");
+				if (f == null){System.out.println("COULD NOT GET DA FUNCTION!");}
+			}
 			else //spatial property
 			{
+				System.out.println("SPATIAL PROPERTY!!!");
 				rightSql = spatialPropertyFunction((FunctionCall) right, function);
 			}
 			rightIsSpatial = true;
@@ -886,7 +896,7 @@
 		{
 			return equalsGeo(leftArg,rightArg);
 		}
-		else if(function.getURI().equals(GeoConstants.inside))
+		else if(function.getURI().equals(GeoConstants.within))
 		{
 			return inside(leftArg,rightArg);
 		}