You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/10/24 14:41:36 UTC
svn commit: r1401656 - in
/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql:
expr/aggregate/AggCountVar.java expr/aggregate/AggCountVarDistinct.java
sse/writers/WriterOp.java
Author: andy
Date: Wed Oct 24 12:41:36 2012
New Revision: 1401656
URL: http://svn.apache.org/viewvc?rev=1401656&view=rev
Log:
Fix -- printed output of algebra involving COUNT did not have a prefix expression.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggCountVar.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggCountVarDistinct.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggCountVar.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggCountVar.java?rev=1401656&r1=1401655&r2=1401656&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggCountVar.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggCountVar.java Wed Oct 24 12:41:36 2012
@@ -24,6 +24,7 @@ import com.hp.hpl.jena.sparql.expr.Expr
import com.hp.hpl.jena.sparql.expr.NodeValue ;
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
import com.hp.hpl.jena.sparql.graph.NodeConst ;
+import com.hp.hpl.jena.sparql.sse.writers.WriterExpr ;
public class AggCountVar extends AggregatorBase
{
@@ -37,7 +38,7 @@ public class AggCountVar extends Aggrega
@Override
public String toString() { return "count("+expr+")" ; }
@Override
- public String toPrefixString() { return "(count "+expr+")" ; }
+ public String toPrefixString() { return "(count "+WriterExpr.asString(expr)+")" ; }
@Override
public Accumulator createAccumulator()
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggCountVarDistinct.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggCountVarDistinct.java?rev=1401656&r1=1401655&r2=1401656&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggCountVarDistinct.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggCountVarDistinct.java Wed Oct 24 12:41:36 2012
@@ -24,6 +24,7 @@ import com.hp.hpl.jena.sparql.expr.Expr
import com.hp.hpl.jena.sparql.expr.NodeValue ;
import com.hp.hpl.jena.sparql.function.FunctionEnv ;
import com.hp.hpl.jena.sparql.graph.NodeConst ;
+import com.hp.hpl.jena.sparql.sse.writers.WriterExpr ;
public class AggCountVarDistinct extends AggregatorBase
{
@@ -37,7 +38,7 @@ public class AggCountVarDistinct extends
@Override
public String toString() { return "count(distinct "+expr+")" ; }
@Override
- public String toPrefixString() { return "(count distinct "+expr+")" ; }
+ public String toPrefixString() { return "(count distinct "+WriterExpr.asString(expr)+")" ; }
@Override
public Accumulator createAccumulator()
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java?rev=1401656&r1=1401655&r2=1401656&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java Wed Oct 24 12:41:36 2012
@@ -645,6 +645,9 @@ public class WriterOp
start() ;
out.print(v.toString()) ;
out.print(" ") ;
+
+ String $ = WriterExpr.asString(expr) ;
+
WriterExpr.output(out, expr, sContext) ;
finish() ;
}