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 2015/10/12 16:06:05 UTC
[9/9] marmotta git commit: re-applied another patch (MARMOTTA-578)
that also got lost in a merge during gsoc
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 <wi...@apache.org>
Authored: Mon Oct 12 16:03:43 2015 +0200
Committer: Sergio Fernández <wi...@apache.org>
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");
}