format code Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/18314005 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/18314005 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/18314005
Branch: refs/heads/MARMOTTA-584 Commit: 1831400548d75cfb99d9ab9bc5a6c48eb4aa5991 Parents: d3c5e0b Author: cuent <[email protected]> Authored: Tue Aug 11 01:05:51 2015 -0500 Committer: cuent <[email protected]> Committed: Tue Aug 11 01:05:51 2015 -0500 ---------------------------------------------------------------------- .../sparql/function/geosparql/UnionFunction.java | 4 ---- .../java/org/apache/marmotta/kiwi/io/KiWiIO.java | 2 +- .../marmotta/kiwi/model/rdf/KiWiGeometryLiteral.java | 8 ++++---- .../apache/marmotta/kiwi/model/rdf/KiWiLiteral.java | 7 +++++-- .../marmotta/kiwi/persistence/KiWiConnection.java | 15 ++++----------- .../apache/marmotta/kiwi/sail/KiWiValueFactory.java | 5 ++--- 6 files changed, 16 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/18314005/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/UnionFunction.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/UnionFunction.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/UnionFunction.java index 3c274d4..10e6456 100644 --- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/UnionFunction.java +++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/function/geosparql/UnionFunction.java @@ -85,12 +85,8 @@ public class UnionFunction implements NativeFunction { public String getNative(KiWiDialect dialect, String... args) { if (dialect instanceof PostgreSQLDialect) { 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 String.format("ST_AsText(ST_Union(%s , %s ) )", args[0], args[1]); - } return String.format("ST_AsText(ST_Union(%s , %s ) )", args[0], args[1]); } - } throw new UnsupportedOperationException("union function not supported by dialect " + dialect); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/18314005/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/io/KiWiIO.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/io/KiWiIO.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/io/KiWiIO.java index b165ccf..945085b 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/io/KiWiIO.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/io/KiWiIO.java @@ -768,7 +768,7 @@ public class KiWiIO { Date created = new Date(input.readLong()); - KiWiGeometryLiteral r = new KiWiGeometryLiteral(content, lang != null ? Locale.forLanguageTag(lang) : null, dtype, created); + KiWiGeometryLiteral r = new KiWiGeometryLiteral(content, dtype, created); r.setId(id); return r; http://git-wip-us.apache.org/repos/asf/marmotta/blob/18314005/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiGeometryLiteral.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiGeometryLiteral.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiGeometryLiteral.java index f9e4ece..4ea5da4 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiGeometryLiteral.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiGeometryLiteral.java @@ -52,13 +52,13 @@ public class KiWiGeometryLiteral extends KiWiLiteral { } - public KiWiGeometryLiteral(String content, Locale language, KiWiUriResource type) { - super(language, type); + public KiWiGeometryLiteral(String content, KiWiUriResource type) { + super(type); this.content = content; } - public KiWiGeometryLiteral(String content, Locale language, KiWiUriResource type, Date created) { - super(language, type, created); + public KiWiGeometryLiteral(String content, KiWiUriResource type, Date created) { + super(null, type, created); this.content = content; } http://git-wip-us.apache.org/repos/asf/marmotta/blob/18314005/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java index 241dfc7..0d0df65 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java @@ -60,7 +60,11 @@ public abstract class KiWiLiteral extends KiWiNode implements Literal { super(created); } - + protected KiWiLiteral(KiWiUriResource type) { + this(); + this.type = type; + } + protected KiWiLiteral(Locale locale, KiWiUriResource type) { this(); this.locale = locale; @@ -73,7 +77,6 @@ public abstract class KiWiLiteral extends KiWiNode implements Literal { this.type = type; } - /** * Return the content of the literal, using the parametrized Java type * @return http://git-wip-us.apache.org/repos/asf/marmotta/blob/18314005/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java index 915243c..b4276eb 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java @@ -754,9 +754,9 @@ public class KiWiConnection implements AutoCloseable { * exist * @throws SQLException */ - public KiWiLiteral loadLiteral(boolean isGeo, String value, String lang, KiWiUriResource ltype) throws SQLException { + public KiWiLiteral loadLiteral(String value, KiWiUriResource ltype) throws SQLException { // look in cache - final KiWiLiteral element = literalCache.get(LiteralCommons.createCacheKey(value, getLocale(lang), ltype)); + final KiWiLiteral element = literalCache.get(LiteralCommons.createCacheKey(value, null, ltype)); if (element != null) { return element; } @@ -773,15 +773,8 @@ public class KiWiConnection implements AutoCloseable { try { // otherwise prepare a query, depending on the parameters given final PreparedStatement query; - if (lang == null && ltype == null) { - query = getPreparedStatement("load.literal_by_v"); - query.setString(1, value); - } else if (lang != null) { - query = getPreparedStatement("load.literal_by_vl"); - query.setString(1, value); - query.setString(2, lang); - } else if (ltype != null) { - query = getPreparedStatement("load.literal_by_gv");///aqui cambiar load.literal_by_gv + if (ltype != null) { + query = getPreparedStatement("load.literal_by_gv"); query.setString(1, value); query.setLong(2, ltype.getId()); } else { http://git-wip-us.apache.org/repos/asf/marmotta/blob/18314005/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java index 393a268..0a10387 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java @@ -375,11 +375,10 @@ public class KiWiValueFactory implements ValueFactory { result = new KiWiBooleanLiteral(bvalue, rtype); } } else if (isGeometry(value.toString()) || type.equals(Namespaces.NS_GEO + "wktLiteral")) { - boolean isGeo = true; - result = connection.loadLiteral(isGeo, value.toString(), lang, rtype); + result = connection.loadLiteral(value.toString(), rtype); if (result == null) { - result = new KiWiGeometryLiteral(value.toString(), locale, rtype); + result = new KiWiGeometryLiteral(value.toString(), rtype); } } else { result = connection.loadLiteral(value.toString(), lang, rtype);
