# HG changeset patch
# User Stella Giannakopoulou <sgian@di.uoa.gr>
# Date 1422031223 -7200
# Node ID 31466cac9cec4f4c03921b06a317cf9b001159ff
# Parent  d4387b73ec9aadd1fae2ea08fb3130062dfdccea
added correct queries and results for the rest functions that are not supported by PostgreSQL Temporal.
Also modified the name of the respective SQL function in order to comply with the script that contains
Allen's functions.

diff -r d4387b73ec9a -r 31466cac9cec generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlFinishes.java
--- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlFinishes.java	Thu Jan 22 19:33:24 2015 +0200
+++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlFinishes.java	Fri Jan 23 18:40:23 2015 +0200
@@ -36,7 +36,7 @@
 	@Override
 	public String getPostgresFunction() {
 		// TODO Auto-generated method stub
-		return "finishesAllen";
+		return "finishes";
 	}
 
 }
\ No newline at end of file
diff -r d4387b73ec9a -r 31466cac9cec generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodIntersects.java
--- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodIntersects.java	Thu Jan 22 19:33:24 2015 +0200
+++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlPeriodIntersects.java	Fri Jan 23 18:40:23 2015 +0200
@@ -9,7 +9,6 @@
  */
 package org.openrdf.sail.generaldb.algebra.temporal;
 
-import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoSpatial;
 import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr;
 
 /**
diff -r d4387b73ec9a -r 31466cac9cec generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlStarts.java
--- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlStarts.java	Thu Jan 22 19:33:24 2015 +0200
+++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/temporal/GeneralDBSqlStarts.java	Fri Jan 23 18:40:23 2015 +0200
@@ -36,7 +36,7 @@
 	@Override
 	public String getPostgresFunction() {
 		// TODO Auto-generated method stub
-		return "startsAllen";
+		return "starts";
 	}
 
 }
\ No newline at end of file
diff -r d4387b73ec9a -r 31466cac9cec testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/TemporalRelations.java
--- a/testsuite/src/test/java/eu/earthobservatory/testsuite/stSPARQL/TemporalRelations.java	Thu Jan 22 19:33:24 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-/**
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- * 
- * Copyright (C) 2010, 2011, 2012, 2013 Pyravlos Team
- * 
- * http://www.strabon.di.uoa.gr/
- */
-package eu.earthobservatory.testsuite.stSPARQL;
-
-import eu.earthobservatory.testsuite.utils.TemplateTest;
-
-
-/**
- * A simple store test. It tests if triples with GML serialization are stored and retrieved correctly.
- * 
- * @author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
- */
-public class TemporalRelations extends TemplateTest{}
diff -r d4387b73ec9a -r 31466cac9cec testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/finishes.rq
--- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/finishes.rq	Thu Jan 22 19:33:24 2015 +0200
+++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/finishes.rq	Fri Jan 23 18:40:23 2015 +0200
@@ -1,7 +1,3 @@
-PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 
-PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 
-
 SELECT distinct ?x1 ?x2 
 			WHERE { 
 				?x1 ?y1 ?z1 ?t1 .
diff -r d4387b73ec9a -r 31466cac9cec testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/finishes.srx
--- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/finishes.srx	Thu Jan 22 19:33:24 2015 +0200
+++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/finishes.srx	Fri Jan 23 18:40:23 2015 +0200
@@ -5,5 +5,37 @@
 		<variable name='x2'/>
 	</head>
 	<results>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item1</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item2</uri>
+			</binding>
+		</result>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item1</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item3</uri>
+			</binding>
+		</result>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item2</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item3</uri>
+			</binding>
+		</result>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item2</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item8</uri>
+			</binding>
+		</result>
 	</results>
 </sparql>
diff -r d4387b73ec9a -r 31466cac9cec testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/meets.srx
--- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/meets.srx	Thu Jan 22 19:33:24 2015 +0200
+++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/meets.srx	Fri Jan 23 18:40:23 2015 +0200
@@ -6,28 +6,36 @@
 	</head>
 	<results>
 		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item1</uri>
+			</binding>
 			<binding name='x2'>
 				<uri>http://example.org/item7</uri>
 			</binding>
+		</result>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item2</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item7</uri>
+			</binding>
+		</result>
+		<result>
 			<binding name='x1'>
 				<uri>http://example.org/item3</uri>
 			</binding>
-		</result>
-		<result>
 			<binding name='x2'>
 				<uri>http://example.org/item7</uri>
 			</binding>
-			<binding name='x1'>
-				<uri>http://example.org/item1</uri>
-			</binding>
 		</result>
 		<result>
-			<binding name='x2'>
+			<binding name='x1'>
 				<uri>http://example.org/item7</uri>
 			</binding>
-			<binding name='x1'>
-				<uri>http://example.org/item2</uri>
+			<binding name='x2'>
+				<uri>http://example.org/item8</uri>
 			</binding>
 		</result>
 	</results>
-</sparql>
+</sparql>
\ No newline at end of file
diff -r d4387b73ec9a -r 31466cac9cec testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/nestedOverleft.srx
--- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/nestedOverleft.srx	Thu Jan 22 19:33:24 2015 +0200
+++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/nestedOverleft.srx	Fri Jan 23 18:40:23 2015 +0200
@@ -6,12 +6,12 @@
 	<results>
 		<result>
 			<binding name='node'>
-				<uri>http://example.org/item2</uri>
+				<uri>http://example.org/item1</uri>
 			</binding>
 		</result>
 		<result>
 			<binding name='node'>
-				<uri>http://example.org/item1</uri>
+				<uri>http://example.org/item2</uri>
 			</binding>
 		</result>
 		<result>
@@ -19,5 +19,10 @@
 				<uri>http://example.org/item3</uri>
 			</binding>
 		</result>
+		<result>
+			<binding name='node'>
+				<uri>http://example.org/item7</uri>
+			</binding>
+		</result>
 	</results>
 </sparql>
\ No newline at end of file
diff -r d4387b73ec9a -r 31466cac9cec testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodIntersects.rq
--- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodIntersects.rq	Thu Jan 22 19:33:24 2015 +0200
+++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodIntersects.rq	Fri Jan 23 18:40:23 2015 +0200
@@ -1,9 +1,5 @@
-PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 
-PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 
-
 SELECT distinct ?x1 ?x2 
 			WHERE { 
 				?x1 ?y1 ?z1 ?t1 .
 				?x2 ?y2 ?z2 ?t2 .
-				FILTER(strdf:periodIntersects(?t1, ?t2) && str(?x1) < str(?x2)).}
\ No newline at end of file
+				FILTER(strdf:PeriodIntersects(?t1, ?t2) && str(?x1) < str(?x2)).}
\ No newline at end of file
diff -r d4387b73ec9a -r 31466cac9cec testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodIntersects.srx
--- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodIntersects.srx	Thu Jan 22 19:33:24 2015 +0200
+++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/periodIntersects.srx	Fri Jan 23 18:40:23 2015 +0200
@@ -5,5 +5,69 @@
 		<variable name='x2'/>
 	</head>
 	<results>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item1</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item2</uri>
+			</binding>
+		</result>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item1</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item3</uri>
+			</binding>
+		</result>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item2</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item3</uri>
+			</binding>
+		</result>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item1</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item7</uri>
+			</binding>
+		</result>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item2</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item7</uri>
+			</binding>
+		</result>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item3</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item7</uri>
+			</binding>
+		</result>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item2</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item8</uri>
+			</binding>
+		</result>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item7</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item8</uri>
+			</binding>
+		</result>
 	</results>
-</sparql>
+</sparql>
\ No newline at end of file
diff -r d4387b73ec9a -r 31466cac9cec testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/starts.srx
--- a/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/starts.srx	Thu Jan 22 19:33:24 2015 +0200
+++ b/testsuite/src/test/resources/stSPARQL/TemporalRelationsTest/starts.srx	Fri Jan 23 18:40:23 2015 +0200
@@ -6,12 +6,28 @@
 	</head>
 	<results>
 		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item1</uri>
+			</binding>
 			<binding name='x2'>
 				<uri>http://example.org/item2</uri>
 			</binding>
+		</result>
+		<result>
 			<binding name='x1'>
 				<uri>http://example.org/item1</uri>
 			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item3</uri>
+			</binding>
+		</result>
+		<result>
+			<binding name='x1'>
+				<uri>http://example.org/item2</uri>
+			</binding>
+			<binding name='x2'>
+				<uri>http://example.org/item3</uri>
+			</binding>
 		</result>
 	</results>
-</sparql>
\ No newline at end of file
+</sparql>