re-applied another patch (MARMOTTA-578) that also got lost in a merge during gsoc
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/87a037dd Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/87a037dd Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/87a037dd Branch: refs/heads/MARMOTTA-584 Commit: 87a037ddc709bda16f35903a04ed4fb3a5847b58 Parents: 9f88ede Author: Sergio Fernández <[email protected]> Authored: Mon Oct 12 16:03:43 2015 +0200 Committer: Sergio Fernández <[email protected]> Committed: Mon Oct 12 16:03:43 2015 +0200 ---------------------------------------------------------------------- .../apache/marmotta/kiwi/sparql/builder/SQLBuilder.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/87a037dd/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 18e9e10..3165e8c 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 @@ -813,6 +813,18 @@ public class SQLBuilder { groupClause.append(", "); } } + + if (orderby.size() > 0) { + groupClause.append(", "); + for(Iterator<OrderElem> it = orderby.iterator(); it.hasNext(); ) { + OrderElem elem = it.next(); + groupClause.append(evaluateExpression(elem.getExpr(), ValueType.STRING)); + if (it.hasNext()) { + groupClause.append(", "); + } + } + } + groupClause.append(" \n"); }
