You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2014/11/09 17:32:34 UTC
marmotta git commit: KIWI: - fix SPARQL projection type for IF - fix
decimal type handling in value factory
Repository: marmotta
Updated Branches:
refs/heads/develop b7ba8ff36 -> 807a4b364
KIWI:
- fix SPARQL projection type for IF
- fix decimal type handling in value factory
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/807a4b36
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/807a4b36
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/807a4b36
Branch: refs/heads/develop
Commit: 807a4b364a26baac159d14aa943e3f7001db0e6c
Parents: b7ba8ff
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Sun Nov 9 17:33:09 2014 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Sun Nov 9 17:33:09 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java | 2 ++
.../main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/807a4b36/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
index 864d2cb..bf79193 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
@@ -853,6 +853,8 @@ public class SQLBuilder {
return ValueType.DOUBLE;
} else if(expr instanceof Compare) {
return ValueType.BOOL;
+ } else if(expr instanceof If) {
+ return getProjectionType(((If) expr).getResult());
} else {
return ValueType.STRING;
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/807a4b36/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 413bd5e..a7086b3 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
@@ -345,7 +345,8 @@ public class KiWiValueFactory implements ValueFactory {
}
} else if(Double.class.equals(value.getClass()) || double.class.equals(value.getClass()) ||
Float.class.equals(value.getClass()) || float.class.equals(value.getClass()) ||
- type.equals(Namespaces.NS_XSD+"double") || type.equals(Namespaces.NS_XSD+"float")) {
+ type.equals(Namespaces.NS_XSD+"double") || type.equals(Namespaces.NS_XSD+"float") ||
+ type.equals(Namespaces.NS_XSD+"decimal")) {
double dvalue = 0.0;
if(Float.class.equals(value.getClass()) || float.class.equals(value.getClass())) {
dvalue = (Float)value;