Using String.format() to improve readability. Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/4a68e351 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/4a68e351 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/4a68e351
Branch: refs/heads/MARMOTTA-584 Commit: 4a68e351270c022460ac92e4de80406b8c56da7a Parents: 480e724 Author: cuent <[email protected]> Authored: Sun Jun 21 21:01:42 2015 -0500 Committer: cuent <[email protected]> Committed: Sun Jun 21 21:01:42 2015 -0500 ---------------------------------------------------------------------- .../kiwi/sparql/function/geosparql/SfBufferFunction.java | 7 +++---- .../kiwi/sparql/function/geosparql/SfContainsFunction.java | 7 +++---- .../kiwi/sparql/function/geosparql/SfConvexHullFunction.java | 7 +++---- .../kiwi/sparql/function/geosparql/SfCrossesFunction.java | 7 +++---- .../kiwi/sparql/function/geosparql/SfDisjointFunction.java | 7 +++---- .../kiwi/sparql/function/geosparql/SfEqualsFunction.java | 7 +++---- .../kiwi/sparql/function/geosparql/SfIntersectsFunction.java | 8 +++----- .../kiwi/sparql/function/geosparql/SfOverlapsFunction.java | 7 +++---- .../kiwi/sparql/function/geosparql/SfTouchesFunction.java | 5 ++--- .../kiwi/sparql/function/geosparql/SfWithinFunction.java | 2 +- .../org/apache/marmotta/kiwi/vocabulary/FN_GEOSPARQL.java | 2 +- 11 files changed, 28 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/4a68e351/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfBufferFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfBufferFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfBufferFunction.java index ccddd0e..fcc8810 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfBufferFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfBufferFunction.java @@ -16,7 +16,6 @@ */ package org.apache.marmotta.kiwi.sparql.function.geosparql; - import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; import org.apache.marmotta.kiwi.sparql.builder.ValueType; @@ -39,7 +38,7 @@ import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; * Note that for performance reasons it might be preferrable to create a geometry index for your database. Please * consult your database documentation on how to do this. * - * @author Xavier Sumba ([email protected])) + * @author Xavier Sumba ([email protected]) */ public class SfBufferFunction implements NativeFunction { @@ -85,9 +84,9 @@ public class SfBufferFunction implements NativeFunction { if(args.length == 2) { if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON)|| args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return "ST_AsText(st_Buffer(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), " + args[1] + " ))"; + return String.format("ST_AsText(st_Buffer(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), %s )) ", args[0], args[0], args[0], args[1]); } - return "ST_AsText(st_Buffer(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), "+ args[1] + " )) "; + return String.format("ST_AsText(st_Buffer(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), %s )) ", args[0], args[0], args[0], args[1]); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4a68e351/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfContainsFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfContainsFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfContainsFunction.java index 0fae34e..2c0c354 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfContainsFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfContainsFunction.java @@ -16,7 +16,6 @@ */ package org.apache.marmotta.kiwi.sparql.function.geosparql; - import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; import org.apache.marmotta.kiwi.sparql.builder.ValueType; @@ -39,7 +38,7 @@ import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; * Note that for performance reasons it might be preferrable to create a geometry index for your database. Please * consult your database documentation on how to do this. * - * @author Xavier Sumba ([email protected])) + * @author Xavier Sumba ([email protected]) */ public class SfContainsFunction implements NativeFunction { @@ -85,9 +84,9 @@ public class SfContainsFunction implements NativeFunction { if(args.length == 2) { if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON)|| args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return "st_Contains(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), " + args[1] + " )"; + return String.format("st_Contains(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), %s )", args[0], args[0], args[0], args[1]); } - return "st_Contains(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), substring( " + args[1] + " from position(' ' in " + args[1] + ") + 1 for char_length( " + args[1] + " ) ) ) "; + return String.format("st_Contains(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), substring( %s from position(' ' in %s) + 1 for char_length( %s ) ) ) ", args[0], args[0], args[0], args[1], args[1], args[1]); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4a68e351/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfConvexHullFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfConvexHullFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfConvexHullFunction.java index 747bced..cdc0bf6 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfConvexHullFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfConvexHullFunction.java @@ -16,7 +16,6 @@ */ package org.apache.marmotta.kiwi.sparql.function.geosparql; - import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; import org.apache.marmotta.kiwi.sparql.builder.ValueType; @@ -39,7 +38,7 @@ import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; * Note that for performance reasons it might be preferrable to create a geometry index for your database. Please * consult your database documentation on how to do this. * - * @author Xavier Sumba ([email protected])) + * @author Xavier Sumba ([email protected]) */ public class SfConvexHullFunction implements NativeFunction { @@ -85,9 +84,9 @@ public class SfConvexHullFunction implements NativeFunction { if(args.length == 1) { if (args[0].contains(FN_GEOSPARQL.MULTIPOLYGON)|| args[0].contains(FN_GEOSPARQL.MULTILINESTRING) || args[0].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return "ST_AsText(st_convexHull( " + args[0] + " ))"; + return String.format("ST_AsText(st_convexHull( %s ))", args[0]); } - return "ST_AsText(st_convexHull(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " )))) "; + return String.format("ST_AsText(st_convexHull(substring( %s from position(' ' in %s) + 1 for char_length( %s )))) ", args[0], args[0], args[0]); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4a68e351/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfCrossesFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfCrossesFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfCrossesFunction.java index b73790c..ff28d17 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfCrossesFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfCrossesFunction.java @@ -16,7 +16,6 @@ */ package org.apache.marmotta.kiwi.sparql.function.geosparql; - import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; import org.apache.marmotta.kiwi.sparql.builder.ValueType; @@ -39,7 +38,7 @@ import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; * Note that for performance reasons it might be preferrable to create a geometry index for your database. Please * consult your database documentation on how to do this. * - * @author Xavier Sumba ([email protected])) + * @author Xavier Sumba ([email protected]) */ public class SfCrossesFunction implements NativeFunction { @@ -85,9 +84,9 @@ public class SfCrossesFunction implements NativeFunction { if(args.length == 2) { if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON)|| args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return "st_Crosses(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), " + args[1] + " )"; + return String.format("st_Crosses(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), %s )", args[0], args[0], args[0], args[1]); } - return "st_Crosses(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), substring( " + args[1] + " from position(' ' in " + args[1] + ") + 1 for char_length( " + args[1] + " ) ) ) "; + return String.format("st_Crosses(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), substring( %s from position(' ' in %s) + 1 for char_length( %s ) ) ) ", args[0], args[0], args[0], args[1], args[1], args[1]); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4a68e351/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfDisjointFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfDisjointFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfDisjointFunction.java index 22d01a3..f6f55ea 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfDisjointFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfDisjointFunction.java @@ -16,7 +16,6 @@ */ package org.apache.marmotta.kiwi.sparql.function.geosparql; - import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; import org.apache.marmotta.kiwi.sparql.builder.ValueType; @@ -39,7 +38,7 @@ import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; * Note that for performance reasons it might be preferrable to create a geometry index for your database. Please * consult your database documentation on how to do this. * - * @author Xavier Sumba ([email protected])) + * @author Xavier Sumba ([email protected]) */ public class SfDisjointFunction implements NativeFunction { @@ -85,9 +84,9 @@ public class SfDisjointFunction implements NativeFunction { if(args.length == 2) { if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON)|| args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return "st_Disjoint(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), " + args[1] + " )"; + return String.format("st_Disjoint(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), %s )", args[0], args[0], args[0], args[1]); } - return "st_Disjoint(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), substring( " + args[1] + " from position(' ' in " + args[1] + ") + 1 for char_length( " + args[1] + " ) ) ) "; + return String.format("st_Disjoint(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), substring( %s from position(' ' in %s) + 1 for char_length( %s ) ) ) ", args[0], args[0], args[0], args[1], args[1], args[1]); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4a68e351/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfEqualsFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfEqualsFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfEqualsFunction.java index 5e869f2..3204dd1 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfEqualsFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfEqualsFunction.java @@ -16,7 +16,6 @@ */ package org.apache.marmotta.kiwi.sparql.function.geosparql; - import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; import org.apache.marmotta.kiwi.sparql.builder.ValueType; @@ -39,7 +38,7 @@ import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; * Note that for performance reasons it might be preferrable to create a geometry index for your database. Please * consult your database documentation on how to do this. * - * @author Xavier Sumba ([email protected])) + * @author Xavier Sumba ([email protected]) */ public class SfEqualsFunction implements NativeFunction { @@ -85,9 +84,9 @@ public class SfEqualsFunction implements NativeFunction { if(args.length == 2) { if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON)|| args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return "st_Equals(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), " + args[1] + " )"; + return String.format("st_Equals(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), %s )", args[0], args[0], args[0], args[1]); } - return "st_Equals(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), substring( " + args[1] + " from position(' ' in " + args[1] + ") + 1 for char_length( " + args[1] + " ) ) ) "; + return String.format("st_Equals(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), substring( %s from position(' ' in %s) + 1 for char_length( %s ) ) ) ", args[0], args[0], args[0], args[1], args[1], args[1]); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4a68e351/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfIntersectsFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfIntersectsFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfIntersectsFunction.java index b6aaf59..3aaefd7 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfIntersectsFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfIntersectsFunction.java @@ -16,13 +16,11 @@ */ package org.apache.marmotta.kiwi.sparql.function.geosparql; - import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; import org.apache.marmotta.kiwi.sparql.builder.ValueType; import org.apache.marmotta.kiwi.sparql.function.NativeFunction; import org.apache.marmotta.kiwi.vocabulary.FN_GEOSPARQL; -import org.apache.marmotta.kiwi.vocabulary.FN_MARMOTTA; import org.openrdf.model.Value; import org.openrdf.model.ValueFactory; import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; @@ -40,7 +38,7 @@ import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; * Note that for performance reasons it might be preferrable to create a geometry index for your database. Please * consult your database documentation on how to do this. * - * @author Xavier Sumba ([email protected])) + * @author Xavier Sumba ([email protected]) */ public class SfIntersectsFunction implements NativeFunction { @@ -86,9 +84,9 @@ public class SfIntersectsFunction implements NativeFunction { if(args.length == 2) { if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON)|| args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return "st_Intersects(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), " + args[1] + " )"; + return String.format("st_Intersects(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), %s )", args[0], args[0], args[0], args[1]); } - return "st_Intersects(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), substring( " + args[1] + " from position(' ' in " + args[1] + ") + 1 for char_length( " + args[1] + " ) ) ) "; + return String.format("st_Intersects(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), substring( %s from position(' ' in %s) + 1 for char_length( %s ) ) ) ", args[0], args[0], args[0], args[1], args[1], args[1]); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4a68e351/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfOverlapsFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfOverlapsFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfOverlapsFunction.java index 3a42afd..3b3cb07 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfOverlapsFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfOverlapsFunction.java @@ -16,7 +16,6 @@ */ package org.apache.marmotta.kiwi.sparql.function.geosparql; - import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; import org.apache.marmotta.kiwi.sparql.builder.ValueType; @@ -39,7 +38,7 @@ import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; * Note that for performance reasons it might be preferrable to create a geometry index for your database. Please * consult your database documentation on how to do this. * - * @author Xavier Sumba ([email protected])) + * @author Xavier Sumba ([email protected]) */ public class SfOverlapsFunction implements NativeFunction { @@ -85,9 +84,9 @@ public class SfOverlapsFunction implements NativeFunction { if(args.length == 2) { if (args[1].contains(FN_GEOSPARQL.MULTIPOLYGON)|| args[1].contains(FN_GEOSPARQL.MULTILINESTRING) || args[1].contains(FN_GEOSPARQL.POINT)) { //If users insert Direct the WKT Geometry - return "st_Overlaps(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), " + args[1] + " )"; + return String.format("st_Overlaps(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), %s )", args[0], args[0], args[0], args[1]); } - return "st_Overlaps(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), substring( " + args[1] + " from position(' ' in " + args[1] + ") + 1 for char_length( " + args[1] + " ) ) ) "; + return String.format("st_Overlaps(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), substring( %s from position(' ' in %s) + 1 for char_length( %s ) ) ) ", args[0], args[0], args[0], args[1], args[1], args[1]); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4a68e351/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfTouchesFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfTouchesFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfTouchesFunction.java index 0d37973..8cd4d07 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfTouchesFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfTouchesFunction.java @@ -16,7 +16,6 @@ */ package org.apache.marmotta.kiwi.sparql.function.geosparql; - import org.apache.marmotta.kiwi.persistence.KiWiDialect; import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect; import org.apache.marmotta.kiwi.sparql.builder.ValueType; @@ -39,7 +38,7 @@ import org.openrdf.query.algebra.evaluation.function.FunctionRegistry; * Note that for performance reasons it might be preferrable to create a geometry index for your database. Please * consult your database documentation on how to do this. * - * @author Xavier Sumba ([email protected])) + * @author Xavier Sumba ([email protected]) */ public class SfTouchesFunction implements NativeFunction { @@ -85,7 +84,7 @@ public class SfTouchesFunction implements NativeFunction { if(args.length == 2) { // if (args[0].contains(FN_GEOSPARQL.POINT.toString()) && args[1].contains(FN_GEOSPARQL.MULTIPOLYGON.toString())) // { - return "st_Touches(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), substring( " + args[1] + " from position(' ' in " + args[1] + ") + 1 for char_length( " + args[1] + " ) ) ) "; + return String.format("st_Touches(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), substring( %s from position(' ' in %s) + 1 for char_length( %s ) ) ) ", args[0], args[0], args[0], args[1], args[1], args[1]); // } // else // if (args[0].contains(FN_GEOSPARQL.POINT.toString()) && args[1].contains(FN_GEOSPARQL.MULTILINESTRING.toString())) http://git-wip-us.apache.org/repos/asf/marmotta/blob/4a68e351/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfWithinFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfWithinFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfWithinFunction.java index ea0286e..90fb5c8 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfWithinFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/SfWithinFunction.java @@ -85,7 +85,7 @@ public class SfWithinFunction implements NativeFunction { if(args.length == 2) { // if (args[0].contains(FN_GEOSPARQL.POINT.toString()) && args[1].contains(FN_GEOSPARQL.MULTIPOLYGON.toString())) // { - return "st_Within(substring( " + args[0] + " from position(' ' in " + args[0] + ") + 1 for char_length( " + args[0] + " ) ), substring( " + args[1] + " from position(' ' in " + args[1] + ") + 1 for char_length( " + args[1] + " ) ) ) "; + return String.format("st_Within(substring( %s from position(' ' in %s) + 1 for char_length( %s ) ), substring( %s from position(' ' in %s) + 1 for char_length( %s ) ) ) ", args[0], args[0], args[0], args[1], args[1], args[1]); // } // else // if (args[0].contains(FN_GEOSPARQL.POINT.toString()) && args[1].contains(FN_GEOSPARQL.MULTILINESTRING.toString())) http://git-wip-us.apache.org/repos/asf/marmotta/blob/4a68e351/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/vocabulary/FN_GEOSPARQL.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/vocabulary/FN_GEOSPARQL.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/vocabulary/FN_GEOSPARQL.java index 07068ca..17e38c7 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/vocabulary/FN_GEOSPARQL.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/vocabulary/FN_GEOSPARQL.java @@ -26,7 +26,7 @@ import org.openrdf.model.impl.ValueFactoryImpl; * Implement geof Function from GeoSPARQL standard * * - * @author Xavier Sumba ([email protected])) + * @author Xavier Sumba ([email protected]) */ public class FN_GEOSPARQL {
