Strabon
changeset 370:d0fce81f7f56
added asGML extension function and linked it with GenearalDBSqlAsGML implementation
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/evaluation/src/main/java/org/openrdf/query/algebra/evaluation/function/spatial/stsparql/property/AsGMLFunc.java Tue Jun 26 21:18:08 2012 +0300 1.3 @@ -0,0 +1,20 @@ 1.4 +/** 1.5 + * 1.6 + */ 1.7 +package org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property; 1.8 + 1.9 +import org.openrdf.query.algebra.evaluation.function.spatial.SpatialPropertyFunc; 1.10 +import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 1.11 + 1.12 +/** 1.13 + * A spatial function returning a geometry in GML encoding. 1.14 + * 1.15 + * @author Charalampos Nikolaou <charnik@di.uoa.gr> 1.16 + */ 1.17 +public class AsGMLFunc extends SpatialPropertyFunc { 1.18 + 1.19 + @Override 1.20 + public String getURI() { 1.21 + return StrabonPolyhedron.asGML; 1.22 + } 1.23 +}
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/GeneralDBSqlGeoAsGML.java Tue Jun 26 21:18:08 2012 +0300 2.3 @@ -0,0 +1,18 @@ 2.4 +/** 2.5 + * 2.6 + */ 2.7 +package org.openrdf.sail.generaldb.algebra; 2.8 + 2.9 +import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 2.10 + 2.11 +/** 2.12 + * @see {@link org.openrdf.query.algebra.evaluation.function.spatial.stsparql.property.AsGMLFunc} 2.13 + * 2.14 + * @author Charalampos Nikolaou <charnik@di.uoa.gr> 2.15 + */ 2.16 +public class GeneralDBSqlGeoAsGML extends GeneralDBSqlSpatialProperty { 2.17 + 2.18 + public GeneralDBSqlGeoAsGML(GeneralDBSqlExpr expr) { 2.19 + super(expr); 2.20 + } 2.21 +} 2.22 \ No newline at end of file
3.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/base/GeneralDBExprSupport.java Tue Jun 26 21:04:42 2012 +0300 3.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/base/GeneralDBExprSupport.java Tue Jun 26 21:18:08 2012 +0300 3.3 @@ -9,13 +9,14 @@ 3.4 3.5 import org.openrdf.model.URI; 3.6 import org.openrdf.model.vocabulary.XMLSchema; 3.7 +import org.openrdf.query.algebra.Compare.CompareOp; 3.8 import org.openrdf.query.algebra.MathExpr; 3.9 -import org.openrdf.query.algebra.Compare.CompareOp; 3.10 import org.openrdf.sail.generaldb.algebra.GeneralDBDoubleValue; 3.11 import org.openrdf.sail.generaldb.algebra.GeneralDBFalseValue; 3.12 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAbove; 3.13 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAbs; 3.14 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAnd; 3.15 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAnyInteract; 3.16 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlBelow; 3.17 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCase; 3.18 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCast; 3.19 @@ -28,6 +29,7 @@ 3.20 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlEq; 3.21 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlEqualsSpatial; 3.22 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoArea; 3.23 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoAsGML; 3.24 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoAsText; 3.25 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoBoundary; 3.26 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoBuffer; 3.27 @@ -59,9 +61,6 @@ 3.28 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlRight; 3.29 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlTouch; 3.30 import org.openrdf.sail.generaldb.algebra.GeneralDBStringValue; 3.31 -import org.openrdf.sail.rdbms.exceptions.UnsupportedRdbmsOperatorException; 3.32 - 3.33 -import org.openrdf.sail.generaldb.algebra.GeneralDBSqlAnyInteract; 3.34 import org.openrdf.sail.generaldb.algebra.egenhofer.GeneralDBSqlEgenhofer_Contains; 3.35 import org.openrdf.sail.generaldb.algebra.egenhofer.GeneralDBSqlEgenhofer_CoveredBy; 3.36 import org.openrdf.sail.generaldb.algebra.egenhofer.GeneralDBSqlEgenhofer_Covers; 3.37 @@ -86,6 +85,7 @@ 3.38 import org.openrdf.sail.generaldb.algebra.sf.GeneralDBSqlSF_Overlaps; 3.39 import org.openrdf.sail.generaldb.algebra.sf.GeneralDBSqlSF_Touches; 3.40 import org.openrdf.sail.generaldb.algebra.sf.GeneralDBSqlSF_Within; 3.41 +import org.openrdf.sail.rdbms.exceptions.UnsupportedRdbmsOperatorException; 3.42 /** 3.43 * Support method to create SQL expressions. 3.44 * 3.45 @@ -400,6 +400,10 @@ 3.46 3.47 return new GeneralDBSqlGeoAsText(expr); 3.48 } 3.49 + 3.50 + public static GeneralDBSqlExpr asGML(GeneralDBSqlExpr expr) { 3.51 + return new GeneralDBSqlGeoAsGML(expr); 3.52 + } 3.53 3.54 public static GeneralDBSqlExpr srid(GeneralDBSqlExpr expr) { 3.55
4.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java Tue Jun 26 21:04:42 2012 +0300 4.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/algebra/factories/GeneralDBBooleanExprFactory.java Tue Jun 26 21:18:08 2012 +0300 4.3 @@ -5,36 +5,92 @@ 4.4 */ 4.5 package org.openrdf.sail.generaldb.algebra.factories; 4.6 4.7 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.above; 4.8 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.abs; 4.9 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.and; 4.10 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.anyInteract; 4.11 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.asGML; 4.12 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.asText; 4.13 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.below; 4.14 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.cmp; 4.15 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.concat; 4.16 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.contains; 4.17 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.coveredBy; 4.18 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.covers; 4.19 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.dimension; 4.20 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.disjoint; 4.21 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehContains; 4.22 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehCoveredBy; 4.23 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehCovers; 4.24 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehDisjoint; 4.25 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehEquals; 4.26 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehInside; 4.27 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehMeet; 4.28 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehOverlap; 4.29 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.eq; 4.30 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.eqComparingNull; 4.31 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.eqIfNotNull; 4.32 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.equalsGeo; 4.33 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoArea; 4.34 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoBoundary; 4.35 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoBuffer; 4.36 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoConvexHull; 4.37 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoDifference; 4.38 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoDistance; 4.39 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoEnvelope; 4.40 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoIntersection; 4.41 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoSymDifference; 4.42 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoTransform; 4.43 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoUnion; 4.44 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geometryType; 4.45 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.gt; 4.46 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.inside; 4.47 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isEmpty; 4.48 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isNotNull; 4.49 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isNull; 4.50 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isSimple; 4.51 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.left; 4.52 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.like; 4.53 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.lowercase; 4.54 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.neq; 4.55 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.not; 4.56 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.num; 4.57 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.or; 4.58 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.overlap; 4.59 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccDisconnected; 4.60 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccEquals; 4.61 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccExternallyConnected; 4.62 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccNonTangentialProperPart; 4.63 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccNonTangentialProperPartInverse; 4.64 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccPartiallyOverlapping; 4.65 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccTangentialProperPart; 4.66 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccTangentialProperPartInverse; 4.67 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.regex; 4.68 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.relate; 4.69 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.right; 4.70 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfContains; 4.71 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfCrosses; 4.72 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfDisjoint; 4.73 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfEquals; 4.74 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfIntersects; 4.75 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfOverlaps; 4.76 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfTouches; 4.77 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfWithin; 4.78 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.simple; 4.79 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sqlNull; 4.80 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.srid; 4.81 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.str; 4.82 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sub; 4.83 +import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.touch; 4.84 import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.unsupported; 4.85 4.86 import org.openrdf.model.Literal; 4.87 import org.openrdf.model.Value; 4.88 import org.openrdf.model.vocabulary.XMLSchema; 4.89 -import org.openrdf.query.QueryEvaluationException; 4.90 import org.openrdf.query.algebra.And; 4.91 import org.openrdf.query.algebra.Bound; 4.92 import org.openrdf.query.algebra.Compare; 4.93 +import org.openrdf.query.algebra.Compare.CompareOp; 4.94 import org.openrdf.query.algebra.FunctionCall; 4.95 import org.openrdf.query.algebra.IsBNode; 4.96 import org.openrdf.query.algebra.IsLiteral; 4.97 @@ -50,7 +106,6 @@ 4.98 import org.openrdf.query.algebra.ValueConstant; 4.99 import org.openrdf.query.algebra.ValueExpr; 4.100 import org.openrdf.query.algebra.Var; 4.101 -import org.openrdf.query.algebra.Compare.CompareOp; 4.102 import org.openrdf.query.algebra.evaluation.function.Function; 4.103 import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; 4.104 import org.openrdf.query.algebra.evaluation.function.spatial.SpatialConstructFunc; 4.105 @@ -65,7 +120,6 @@ 4.106 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.BoundaryFunc; 4.107 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.ConvexHullFunc; 4.108 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.EnvelopeFunc; 4.109 -import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.TransformFunc; 4.110 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.construct.UnionFunc; 4.111 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.metric.AreaFunc; 4.112 import org.openrdf.query.algebra.evaluation.function.spatial.stsparql.relation.RelateFunc; 4.113 @@ -78,70 +132,6 @@ 4.114 import org.openrdf.sail.generaldb.algebra.base.GeneralDBSqlExpr; 4.115 import org.openrdf.sail.rdbms.exceptions.UnsupportedRdbmsOperatorException; 4.116 4.117 - 4.118 - 4.119 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.anyInteract; 4.120 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.touch; 4.121 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.contains; 4.122 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.coveredBy; 4.123 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.covers; 4.124 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.disjoint; 4.125 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.equalsGeo; 4.126 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.overlap; 4.127 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.inside; 4.128 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.relate; 4.129 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.left; 4.130 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.right; 4.131 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.above; 4.132 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.below; 4.133 - 4.134 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfContains; 4.135 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfCrosses; 4.136 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfDisjoint; 4.137 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfEquals; 4.138 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfIntersects; 4.139 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfOverlaps; 4.140 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfTouches; 4.141 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.sfWithin; 4.142 - 4.143 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccDisconnected; 4.144 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccEquals; 4.145 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccExternallyConnected; 4.146 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccNonTangentialProperPart; 4.147 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccNonTangentialProperPartInverse; 4.148 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccPartiallyOverlapping; 4.149 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccTangentialProperPart; 4.150 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.rccTangentialProperPartInverse; 4.151 - 4.152 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehContains; 4.153 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehCoveredBy; 4.154 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehCovers; 4.155 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehDisjoint; 4.156 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehEquals; 4.157 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehInside; 4.158 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehMeet; 4.159 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.ehOverlap; 4.160 - 4.161 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoUnion; 4.162 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoBuffer; 4.163 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoTransform; 4.164 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoEnvelope; 4.165 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoConvexHull; 4.166 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoBoundary; 4.167 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoDifference; 4.168 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoIntersection; 4.169 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoSymDifference; 4.170 - 4.171 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoDistance; 4.172 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geoArea; 4.173 - 4.174 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.dimension; 4.175 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.geometryType; 4.176 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.asText; 4.177 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.srid; 4.178 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isEmpty; 4.179 -import static org.openrdf.sail.generaldb.algebra.base.GeneralDBExprSupport.isSimple; 4.180 - 4.181 /** 4.182 * Boolean SQL expression factory. This factory can convert a number of core 4.183 * algebra nodes into an SQL expression. 4.184 @@ -1219,6 +1209,9 @@ 4.185 else if(function.getURI().equals(StrabonPolyhedron.isSimple)) 4.186 { 4.187 return isSimple(arg); 4.188 + 4.189 + } else if (function.getURI().equals(StrabonPolyhedron.asGML)) { 4.190 + return asGML(arg); 4.191 } 4.192 4.193 //Should never reach this place
5.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java Tue Jun 26 21:04:42 2012 +0300 5.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/evaluation/GeneralDBEvaluation.java Tue Jun 26 21:18:08 2012 +0300 5.3 @@ -70,6 +70,7 @@ 5.4 import org.openrdf.sail.generaldb.algebra.GeneralDBSelectQuery; 5.5 import org.openrdf.sail.generaldb.algebra.GeneralDBSelectQuery.OrderElem; 5.6 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlCase; 5.7 +import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoAsGML; 5.8 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoAsText; 5.9 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoDimension; 5.10 import org.openrdf.sail.generaldb.algebra.GeneralDBSqlGeoGeometryType; 5.11 @@ -931,7 +932,8 @@ 5.12 return ResultType.INTEGER; 5.13 } 5.14 else if(expr instanceof GeneralDBSqlGeoGeometryType || 5.15 - expr instanceof GeneralDBSqlGeoAsText ) 5.16 + expr instanceof GeneralDBSqlGeoAsText || 5.17 + expr instanceof GeneralDBSqlGeoAsGML) 5.18 { 5.19 return ResultType.STRING; 5.20 }
6.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/iteration/GeneralDBBindingIteration.java Tue Jun 26 21:04:42 2012 +0300 6.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/iteration/GeneralDBBindingIteration.java Tue Jun 26 21:18:08 2012 +0300 6.3 @@ -5,38 +5,30 @@ 6.4 */ 6.5 package org.openrdf.sail.generaldb.iteration; 6.6 6.7 -import java.sql.Blob; 6.8 import java.sql.PreparedStatement; 6.9 import java.sql.ResultSet; 6.10 import java.sql.SQLException; 6.11 -import java.util.ArrayList; 6.12 import java.util.Collection; 6.13 import java.util.HashMap; 6.14 -import java.util.List; 6.15 6.16 -import org.openrdf.model.Literal; 6.17 import org.openrdf.model.Value; 6.18 import org.openrdf.query.BindingSet; 6.19 import org.openrdf.query.QueryEvaluationException; 6.20 import org.openrdf.query.algebra.evaluation.QueryBindingSet; 6.21 -import org.openrdf.query.algebra.evaluation.function.spatial.StrabonPolyhedron; 6.22 import org.openrdf.sail.generaldb.GeneralDBSpatialFuncInfo; 6.23 import org.openrdf.sail.generaldb.GeneralDBValueFactory; 6.24 import org.openrdf.sail.generaldb.algebra.GeneralDBColumnVar; 6.25 +import org.openrdf.sail.generaldb.schema.IdSequence; 6.26 +import org.openrdf.sail.generaldb.schema.ValueTable; 6.27 import org.openrdf.sail.rdbms.exceptions.RdbmsQueryEvaluationException; 6.28 import org.openrdf.sail.rdbms.iteration.base.RdbmIterationBase; 6.29 import org.openrdf.sail.rdbms.model.RdbmsResource; 6.30 import org.openrdf.sail.rdbms.model.RdbmsValue; 6.31 -import org.openrdf.sail.generaldb.model.GeneralDBPolyhedron; 6.32 -import org.openrdf.sail.generaldb.schema.IdSequence; 6.33 -import org.openrdf.sail.generaldb.schema.ValueTable; 6.34 - 6.35 -import com.vividsolutions.jts.io.ParseException; 6.36 6.37 /** 6.38 * Converts a {@link ResultSet} into a {@link BindingSet} in an iteration. 6.39 * 6.40 - * @author James Leigh 6.41 + * @author Manos Karpathiotakis <mk@di.uoa.gr> 6.42 * 6.43 */ 6.44 public abstract class GeneralDBBindingIteration extends RdbmIterationBase<BindingSet, QueryEvaluationException> {