Strabon

changeset 1053:a0ba95cfaa5a temporals

resolved merge issues and fixed compilation errors
author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
date Fri Apr 19 16:04:05 2013 +0300 (2013-04-19)
parents e88617751ee6
children 3803532cc513
files evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/TemporalConstants.java generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java pom.xml postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java testsuite/pom.xml vocab/pom.xml
line diff
     1.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java	Fri Apr 19 14:37:09 2013 +0300
     1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java	Fri Apr 19 16:04:05 2013 +0300
     1.3 @@ -9,9 +9,9 @@
     1.4   */
     1.5  package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation;
     1.6  
     1.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
     1.8  import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc;
     1.9 - 
    1.10 +
    1.11 +import eu.earthobservatory.constants.GeoConstants; 
    1.12  /**
    1.13   * 
    1.14   * @author Manos Karpathiotakis <mk@di.uoa.gr>
    1.15 @@ -20,6 +20,6 @@
    1.16  
    1.17  	@Override
    1.18  	public String getURI() {
    1.19 -		return GeoConstants.within;
    1.20 +		return GeoConstants.stSPARQLwithin;
    1.21  	}
    1.22  }
     2.1 --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/TemporalConstants.java	Fri Apr 19 14:37:09 2013 +0300
     2.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/TemporalConstants.java	Fri Apr 19 16:04:05 2013 +0300
     2.3 @@ -9,7 +9,8 @@
     2.4   */
     2.5  package org.openrdf.query.algebra.evaluation.function.temporal.stsparql.relation;
     2.6  
     2.7 -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants;
     2.8 +
     2.9 +import eu.earthobservatory.constants.GeoConstants;
    2.10  
    2.11  /**
    2.12   * @author Konstantina Bereta <Konstantina.Bereta@di.uoa.gr>
     3.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java	Fri Apr 19 14:37:09 2013 +0300
     3.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java	Fri Apr 19 16:04:05 2013 +0300
     3.3 @@ -5,88 +5,7 @@
     3.4   */
     3.5  package org.openrdf.sail.generaldb.algebra.factories;
     3.6  
     3.7 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.above;
     3.8 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.abs;
     3.9 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.and;
    3.10 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.asGML;
    3.11 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.asText;
    3.12 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.below;
    3.13 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.cmp;
    3.14 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.concat;
    3.15 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.contains;
    3.16 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.crosses;
    3.17 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.diffDateTime;
    3.18 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.dimension;
    3.19 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.disjoint;
    3.20 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehContains;
    3.21 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehCoveredBy;
    3.22 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehCovers;
    3.23 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehDisjoint;
    3.24 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehEquals;
    3.25 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehInside;
    3.26 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehMeet;
    3.27 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehOverlap;
    3.28 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.eq;
    3.29 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.eqComparingNull;
    3.30 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.eqIfNotNull;
    3.31 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.equalsGeo;
    3.32 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoArea;
    3.33 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoBoundary;
    3.34 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoBuffer;
    3.35 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoConvexHull;
    3.36 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoDifference;
    3.37 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoDistance;
    3.38 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoEnvelope;
    3.39 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoIntersection;
    3.40 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoSymDifference;
    3.41 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoTransform;
    3.42 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoUnion;
    3.43 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geometryType;
    3.44 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.gt;
    3.45 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.intersects;
    3.46 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isEmpty;
    3.47 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isNotNull;
    3.48 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isNull;
    3.49 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isSimple;
    3.50 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.left;
    3.51 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.like;
    3.52 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.lowercase;
    3.53 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.mbbContains;
    3.54 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.mbbEqualsGeo;
    3.55 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.mbbIntersects;
    3.56 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.mbbWithin;
    3.57 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.neq;
    3.58 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.not;
    3.59 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.num;
    3.60 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.or;
    3.61 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.overlaps;
    3.62 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccDisconnected;
    3.63 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccEquals;
    3.64 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccExternallyConnected;
    3.65 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccNonTangentialProperPart;
    3.66 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccNonTangentialProperPartInverse;
    3.67 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccPartiallyOverlapping;
    3.68 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccTangentialProperPart;
    3.69 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccTangentialProperPartInverse;
    3.70 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.regex;
    3.71 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.relate;
    3.72 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.right;
    3.73 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfContains;
    3.74 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfCrosses;
    3.75 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfDisjoint;
    3.76 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfEquals;
    3.77 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfIntersects;
    3.78 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfOverlaps;
    3.79 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfTouches;
    3.80 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfWithin;
    3.81 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.simple;
    3.82 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sqlNull;
    3.83 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.srid;
    3.84 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.str;
    3.85 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sub;
    3.86 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.touches;
    3.87 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.unsupported;
    3.88 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.within;
    3.89 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.*;
    3.90  
    3.91  import org.openrdf.model.Literal;
    3.92  import org.openrdf.model.Value;
     4.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java	Fri Apr 19 14:37:09 2013 +0300
     4.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java	Fri Apr 19 16:04:05 2013 +0300
     4.3 @@ -60,6 +60,7 @@
     4.4  import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbContainsFunc;
     4.5  import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbEqualsFunc;
     4.6  import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbIntersectsFunc;
     4.7 +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbWithinFunc;
     4.8  import org.openrdf.query.algebra.evaluation.function.temporal.stsparql.construct.TemporalConstructFunc;
     4.9  import org.openrdf.query.algebra.evaluation.function.temporal.stsparql.relation.TemporalConstants;
    4.10  import org.openrdf.query.algebra.evaluation.function.temporal.stsparql.relation.TemporalRelationFunc;
     5.1 --- a/pom.xml	Fri Apr 19 14:37:09 2013 +0300
     5.2 +++ b/pom.xml	Fri Apr 19 16:04:05 2013 +0300
     5.3 @@ -898,8 +898,8 @@
     5.4              <name>Strabon - maven repository - sesame artifacts (temporary)</name>
     5.5              <url>http://maven.strabon.di.uoa.gr/content/repositories/strabon.sesame/</url>
     5.6          </repository>
     5.7 -		<!--
     5.8 -		<repository>
     5.9 +		 <!-- 
    5.10 +		 <repository>
    5.11  			<releases>
    5.12  				<enabled>true</enabled>
    5.13  			</releases>
    5.14 @@ -910,7 +910,6 @@
    5.15  			<name>Strabon - maven repository - sesame artifacts (temporary)</name>
    5.16  			<url>http://maven.strabon.di.uoa.gr/content/repositories/strabon.sesame</url>
    5.17  		</repository>
    5.18 -		<!--
    5.19  		<repository>
    5.20  			<releases>
    5.21  				<enabled>true</enabled>
    5.22 @@ -933,7 +932,7 @@
    5.23  			<name>Aduna Open Source - Maven snapshots</name>
    5.24  			<url>http://repo.aduna-software.org/maven2/snapshots</url>
    5.25  		</repository>
    5.26 -		-->
    5.27 +		 -->
    5.28  		<repository>
    5.29  			<snapshots>
    5.30  				<enabled>true</enabled>
     6.1 --- a/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java	Fri Apr 19 14:37:09 2013 +0300
     6.2 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java	Fri Apr 19 16:04:05 2013 +0300
     6.3 @@ -286,7 +286,7 @@
     6.4  				filter.openBracket();
     6.5  				System.out.println("267");
     6.6  				//
     6.7 -				String alias = getLabelAlias(var.getRdbmsVar());
     6.8 +				 alias = getLabelAlias(var.getRdbmsVar());
     6.9  
    6.10  				filter.column(alias, STRDFGEO_FIELD);
    6.11  				//XXX SRID
    6.12 @@ -1863,7 +1863,8 @@
    6.13  
    6.14  
    6.15  			}
    6.16 -	
    6.17 +	protected void appendGeneralDBSpatialFunctionBinary(BinaryGeneralDBOperator expr, GeneralDBSqlExprBuilder filter, SpatialFunctionsPostGIS func)
    6.18 +			throws UnsupportedRdbmsOperatorException
    6.19  	{
    6.20  		//In the case where no variable is present in the expression! e.g ConvexHull("POLYGON((.....))")
    6.21  		boolean sridNeeded = true;
     7.1 --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Fri Apr 19 14:37:09 2013 +0300
     7.2 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java	Fri Apr 19 16:04:05 2013 +0300
     7.3 @@ -17,6 +17,8 @@
     7.4  import java.io.ByteArrayInputStream;
     7.5  import java.io.File;
     7.6  import java.io.IOException;
     7.7 +import java.io.InputStream;
     7.8 +import java.io.InputStreamReader;
     7.9  import java.io.OutputStream;
    7.10  import java.io.StringReader;
    7.11  import java.net.MalformedURLException;
    7.12 @@ -508,6 +510,9 @@
    7.13  		if(format.equals(RDFFormat.NQUADS))
    7.14  		{
    7.15  			String line;
    7.16 +			InputStream in = (InputStream) url.openStream();
    7.17 +			InputStreamReader reader = new InputStreamReader(in);
    7.18 +			
    7.19  			StringBuilder batch=new StringBuilder();
    7.20  			int counter=0;
    7.21  			BufferedReader br = new BufferedReader(reader);
    7.22 @@ -586,7 +591,7 @@
    7.23  		if(format.equals(RDFFormat.NQUADS))
    7.24  		{
    7.25  			ByteArrayInputStream in = new ByteArrayInputStream(text.getBytes());
    7.26 -			NQuadsTranslator translator = new NQuadsTranslator(con1);
    7.27 +			NQuadsTranslator translator = new NQuadsTranslator(con);
    7.28  						 
    7.29  			Collection<Statement> statements = translator.translate(in, baseURI);
    7.30  			Iterator iterator = statements.iterator();
    7.31 @@ -595,7 +600,7 @@
    7.32  				if(st.getContext() == null)
    7.33  				{ //this statement of the NQUAD graph is a triple- (null context)
    7.34  
    7.35 -					con1.add(st.getSubject(), st.getPredicate(), st.getObject());
    7.36 +					con.add(st.getSubject(), st.getPredicate(), st.getObject());
    7.37  
    7.38  				}
    7.39  				else //this statement of the NQUAD graph is a quad
    7.40 @@ -610,7 +615,7 @@
    7.41  					 }	 
    7.42  					try {
    7.43  						Resource newContext = new NQuadsParser().createValidTimeURI(validPeriod);
    7.44 -						con1.add(st.getSubject(), st.getPredicate(), st.getObject(), newContext);
    7.45 +						con.add(st.getSubject(), st.getPredicate(), st.getObject(), newContext);
    7.46  					} catch (ParseException e) {
    7.47  						logger.error(this.getClass().toString()+": error when constructing the new context");
    7.48  						e.printStackTrace();
     8.1 --- a/testsuite/pom.xml	Fri Apr 19 14:37:09 2013 +0300
     8.2 +++ b/testsuite/pom.xml	Fri Apr 19 16:04:05 2013 +0300
     8.3 @@ -5,7 +5,7 @@
     8.4  	<parent>
     8.5  		<groupId>eu.earthobservatory</groupId>
     8.6  		<artifactId>strabon</artifactId>
     8.7 -		<version>3.2.9-SNAPSHOT</version>
     8.8 +		<version>3.2.8-temporals-SNAPSHOT</version>
     8.9  	</parent>
    8.10  
    8.11  	<artifactId>strabon-testsuite</artifactId>
    8.12 @@ -28,4 +28,4 @@
    8.13  		</dependency>	
    8.14  	</dependencies>
    8.15  
    8.16 -</project>
    8.17 \ No newline at end of file
    8.18 +</project>
     9.1 --- a/vocab/pom.xml	Fri Apr 19 14:37:09 2013 +0300
     9.2 +++ b/vocab/pom.xml	Fri Apr 19 16:04:05 2013 +0300
     9.3 @@ -5,7 +5,7 @@
     9.4  	<parent>
     9.5  		<groupId>eu.earthobservatory</groupId>
     9.6  		<artifactId>strabon</artifactId>
     9.7 -		<version>3.2.9-SNAPSHOT</version>
     9.8 +		<version>3.2.8-temporals-SNAPSHOT</version>
     9.9  	</parent>
    9.10  
    9.11  	<artifactId>strabon-vocabulary</artifactId>