# HG changeset patch # User Konstantina Bereta # Date 1366376645 -10800 # Node ID a0ba95cfaa5afbe6800ef158aead6e28e54f6f33 # Parent e88617751ee6e788bb250097d5ca94ff434172fb resolved merge issues and fixed compilation errors diff -r e88617751ee6 -r a0ba95cfaa5a 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 Apr 19 14:37:09 2013 +0300 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/relation/InsideFunc.java Fri Apr 19 16:04:05 2013 +0300 @@ -9,9 +9,9 @@ */ package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation; -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; import org.openrdf.query.algebra.evaluation.function.spatial.SpatialRelationshipFunc; - + +import eu.earthobservatory.constants.GeoConstants; /** * * @author Manos Karpathiotakis @@ -20,6 +20,6 @@ @Override public String getURI() { - return GeoConstants.within; + return GeoConstants.stSPARQLwithin; } } diff -r e88617751ee6 -r a0ba95cfaa5a evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/TemporalConstants.java --- a/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/TemporalConstants.java Fri Apr 19 14:37:09 2013 +0300 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/temporal/stsparql/relation/TemporalConstants.java Fri Apr 19 16:04:05 2013 +0300 @@ -9,7 +9,8 @@ */ package org.openrdf.query.algebra.evaluation.function.temporal.stsparql.relation; -import org.openrdf.query.algebra.evaluation.function.spatial.GeoConstants; + +import eu.earthobservatory.constants.GeoConstants; /** * @author Konstantina Bereta diff -r e88617751ee6 -r a0ba95cfaa5a 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 Apr 19 14:37:09 2013 +0300 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java Fri Apr 19 16:04:05 2013 +0300 @@ -5,88 +5,7 @@ */ package org.openrdf.sail.generaldb.algebra.factories; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.above; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.abs; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.and; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.asGML; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.asText; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.below; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.cmp; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.concat; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.contains; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.crosses; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.diffDateTime; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.dimension; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.disjoint; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehContains; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehCoveredBy; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehCovers; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehDisjoint; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehEquals; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehInside; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehMeet; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehOverlap; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.eq; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.eqComparingNull; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.eqIfNotNull; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.equalsGeo; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoArea; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoBoundary; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoBuffer; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoConvexHull; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoDifference; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoDistance; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoEnvelope; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoIntersection; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoSymDifference; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoTransform; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoUnion; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geometryType; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.gt; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.intersects; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isEmpty; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isNotNull; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isNull; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isSimple; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.left; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.like; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.lowercase; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.mbbContains; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.mbbEqualsGeo; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.mbbIntersects; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.mbbWithin; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.neq; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.not; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.num; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.or; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.overlaps; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccDisconnected; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccEquals; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccExternallyConnected; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccNonTangentialProperPart; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccNonTangentialProperPartInverse; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccPartiallyOverlapping; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccTangentialProperPart; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccTangentialProperPartInverse; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.regex; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.relate; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.right; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfContains; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfCrosses; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfDisjoint; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfEquals; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfIntersects; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfOverlaps; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfTouches; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfWithin; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.simple; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sqlNull; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.srid; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.str; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sub; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.touches; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.unsupported; -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.within; +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.*; import org.openrdf.model.Literal; import org.openrdf.model.Value; diff -r e88617751ee6 -r a0ba95cfaa5a generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java Fri Apr 19 14:37:09 2013 +0300 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java Fri Apr 19 16:04:05 2013 +0300 @@ -60,6 +60,7 @@ import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbContainsFunc; import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbEqualsFunc; import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbIntersectsFunc; +import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.mbb.MbbWithinFunc; import org.openrdf.query.algebra.evaluation.function.temporal.stsparql.construct.TemporalConstructFunc; import org.openrdf.query.algebra.evaluation.function.temporal.stsparql.relation.TemporalConstants; import org.openrdf.query.algebra.evaluation.function.temporal.stsparql.relation.TemporalRelationFunc; diff -r e88617751ee6 -r a0ba95cfaa5a pom.xml --- a/pom.xml Fri Apr 19 14:37:09 2013 +0300 +++ b/pom.xml Fri Apr 19 16:04:05 2013 +0300 @@ -898,8 +898,8 @@ Strabon - maven repository - sesame artifacts (temporary) http://maven.strabon.di.uoa.gr/content/repositories/strabon.sesame/ - + --> true diff -r e88617751ee6 -r a0ba95cfaa5a postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java --- a/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java Fri Apr 19 14:37:09 2013 +0300 +++ b/postgis/src/main/java/org/openrdf/sail/postgis/evaluation/PostGISQueryBuilder.java Fri Apr 19 16:04:05 2013 +0300 @@ -286,7 +286,7 @@ filter.openBracket(); System.out.println("267"); // - String alias = getLabelAlias(var.getRdbmsVar()); + alias = getLabelAlias(var.getRdbmsVar()); filter.column(alias, STRDFGEO_FIELD); //XXX SRID @@ -1863,7 +1863,8 @@ } - + protected void appendGeneralDBSpatialFunctionBinary(BinaryGeneralDBOperator expr, GeneralDBSqlExprBuilder filter, SpatialFunctionsPostGIS func) + throws UnsupportedRdbmsOperatorException { //In the case where no variable is present in the expression! e.g ConvexHull("POLYGON((.....))") boolean sridNeeded = true; diff -r e88617751ee6 -r a0ba95cfaa5a runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java --- a/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java Fri Apr 19 14:37:09 2013 +0300 +++ b/runtime/src/main/java/eu/earthobservatory/runtime/generaldb/Strabon.java Fri Apr 19 16:04:05 2013 +0300 @@ -17,6 +17,8 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.io.OutputStream; import java.io.StringReader; import java.net.MalformedURLException; @@ -508,6 +510,9 @@ if(format.equals(RDFFormat.NQUADS)) { String line; + InputStream in = (InputStream) url.openStream(); + InputStreamReader reader = new InputStreamReader(in); + StringBuilder batch=new StringBuilder(); int counter=0; BufferedReader br = new BufferedReader(reader); @@ -586,7 +591,7 @@ if(format.equals(RDFFormat.NQUADS)) { ByteArrayInputStream in = new ByteArrayInputStream(text.getBytes()); - NQuadsTranslator translator = new NQuadsTranslator(con1); + NQuadsTranslator translator = new NQuadsTranslator(con); Collection statements = translator.translate(in, baseURI); Iterator iterator = statements.iterator(); @@ -595,7 +600,7 @@ if(st.getContext() == null) { //this statement of the NQUAD graph is a triple- (null context) - con1.add(st.getSubject(), st.getPredicate(), st.getObject()); + con.add(st.getSubject(), st.getPredicate(), st.getObject()); } else //this statement of the NQUAD graph is a quad @@ -610,7 +615,7 @@ } try { Resource newContext = new NQuadsParser().createValidTimeURI(validPeriod); - con1.add(st.getSubject(), st.getPredicate(), st.getObject(), newContext); + con.add(st.getSubject(), st.getPredicate(), st.getObject(), newContext); } catch (ParseException e) { logger.error(this.getClass().toString()+": error when constructing the new context"); e.printStackTrace(); diff -r e88617751ee6 -r a0ba95cfaa5a testsuite/pom.xml --- a/testsuite/pom.xml Fri Apr 19 14:37:09 2013 +0300 +++ b/testsuite/pom.xml Fri Apr 19 16:04:05 2013 +0300 @@ -5,7 +5,7 @@ eu.earthobservatory strabon - 3.2.9-SNAPSHOT + 3.2.8-temporals-SNAPSHOT strabon-testsuite @@ -28,4 +28,4 @@ - \ No newline at end of file + diff -r e88617751ee6 -r a0ba95cfaa5a vocab/pom.xml --- a/vocab/pom.xml Fri Apr 19 14:37:09 2013 +0300 +++ b/vocab/pom.xml Fri Apr 19 16:04:05 2013 +0300 @@ -5,7 +5,7 @@ eu.earthobservatory strabon - 3.2.9-SNAPSHOT + 3.2.8-temporals-SNAPSHOT strabon-vocabulary