You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2016/05/02 11:50:03 UTC

[26/50] [abbrv] marmotta git commit: MARMOTTA-628: applied patch by @orinciog from github, closes #18

MARMOTTA-628: applied patch by @orinciog from github, closes #18


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2a6f700c
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2a6f700c
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2a6f700c

Branch: refs/heads/MARMOTTA-584
Commit: 2a6f700c3368438acb873dc1040ed83a329cd27c
Parents: 7eb9bc2
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Fri Feb 12 13:21:36 2016 +0100
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Fri Feb 12 13:21:36 2016 +0100

----------------------------------------------------------------------
 .../kiwi/sparql/builder/eval/ValueExpressionEvaluator.java      | 4 ++++
 .../org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java    | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/2a6f700c/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java
index 2d41ff9..2082164 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java
@@ -500,9 +500,13 @@ public class ValueExpressionEvaluator extends QueryModelVisitorBase<RuntimeExcep
             }
 
             optypes.push(ot);
+	    builder.append("(");
             expr.getLeftArg().visit(this);
+	    builder.append(")");
             builder.append(getSQLOperator(expr.getOperator()));
+	    builder.append("(");
             expr.getRightArg().visit(this);
+	    builder.append(")");
             optypes.pop();
         }
     }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/2a6f700c/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
index 1246845..67be368 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
+++ b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
@@ -296,13 +296,12 @@ public class KiWiSparqlTest {
         }
     }
 
-    /*
-    see https://issues.apache.org/jira/browse/MARMOTTA-628
+    
     @Test
     public void testMarmotta627_1() throws Exception {
         testMarmotta627("SELECT ( (4.5-4.4)*0.1 as ?c )  WHERE {}", 0.01);
     }
-    */
+    
 
     @Test
     public void testMarmotta627_2() throws Exception {