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/07/01 12:16:45 UTC
[25/25] marmotta git commit: merged develop into MARMOTTA-584
merged develop into MARMOTTA-584
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/ee9d578c
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/ee9d578c
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/ee9d578c
Branch: refs/heads/MARMOTTA-584
Commit: ee9d578cfb61fb44ac5f56683e91573be3ff62ec
Parents: b33b132 2306e05
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Fri Jul 1 14:06:10 2016 +0200
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Fri Jul 1 14:06:10 2016 +0200
----------------------------------------------------------------------
.github/PULL_REQUEST_TEMPLATE.md | 12 +
Dockerfile | 5 +-
.../marmotta-client-js/src/main/js/marmotta.js | 34 ++
launchers/marmotta-webapp/pom.xml | 2 +-
.../marmotta-webapp/src/docker/entrypoint.sh | 15 +
.../kiwi/sparql/builder/SQLBuilder.java | 25 +-
.../builder/collect/PatternCollector.java | 9 +-
.../kiwi/sparql/builder/model/SQLUnion.java | 10 +-
.../optimizer/DistinctLimitOptimizer.java | 3 +-
.../sparql/optimizer/NativeFilterOptimizer.java | 17 +
.../sparql/sail/KiWiSparqlSailConnection.java | 2 +-
.../kiwi/sparql/test/KiWiSparqlTest.java | 36 +-
.../kiwi/sparql/test/MARMOTTA-640_1.sparql | 33 ++
.../kiwi/sparql/test/MARMOTTA-640_2.sparql | 51 +++
libraries/ostrich/pom.xml | 9 +
.../marmotta/loader/core/MarmottaLoader.java | 13 +-
parent/pom.xml | 6 +-
.../main/resources/web/public/style/red/404.css | 43 +++
.../resources/web/public/style/red/code.css | 51 +++
.../resources/web/public/style/red/error.css | 31 ++
.../resources/web/public/style/red/javadoc.css | 113 +++++++
.../resources/web/public/style/red/rdfhtml.css | 41 +++
.../web/public/style/red/sgvizler.chart.css | 53 +++
.../resources/web/public/style/red/style.css | 339 +++++++++++++++++++
.../test/triplestore/ContextServiceTest.java | 17 +
.../services/LdpBinaryStoreServiceImplTest.java | 5 +-
pom.xml | 1 +
27 files changed, 928 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/ee9d578c/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
----------------------------------------------------------------------
diff --cc libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
index 3165e8c,9dc1426..fc3df21
--- 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
@@@ -620,11 -613,11 +615,10 @@@ public class SQLBuilder
List<SQLVariable> vars = new ArrayList<>(variables.values());
Collections.sort(vars, SQLVariable.sparqlNameComparator);
-
for(SQLVariable v : vars) {
+ final String projectedName = v.getName();
if(v.getProjectionType() != ValueType.NONE && (projectedVars.isEmpty() || projectedVars.contains(v.getSparqlName()))) {
- String projectedName = v.getName();
-
if (v.getExpressions() != null && v.getExpressions().size() > 0) {
String fromName = v.getExpressions().get(0);
projections.add(fromName + " AS " + projectedName);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/ee9d578c/parent/pom.xml
----------------------------------------------------------------------