You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by an...@apache.org on 2013/09/27 03:37:43 UTC
git commit: MARMOTTA-325 : Use supported settings to enable use of
the templating service by third-parties
Updated Branches:
refs/heads/develop 10d862669 -> 513b24ce8
MARMOTTA-325 : Use supported settings to enable use of the templating
service by third-parties
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/513b24ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/513b24ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/513b24ce
Branch: refs/heads/develop
Commit: 513b24ce897d921af22062247df002f953c285e8
Parents: 10d8626
Author: Peter Ansell <p_...@yahoo.com>
Authored: Fri Sep 27 11:37:25 2013 +1000
Committer: Peter Ansell <p_...@yahoo.com>
Committed: Fri Sep 27 11:37:25 2013 +1000
----------------------------------------------------------------------
.../sparql/services/sparql/SparqlServiceImpl.java | 2 +-
.../sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/513b24ce/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
index f034373..0fc1417 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
@@ -508,7 +508,7 @@ public class SparqlServiceImpl implements SparqlService {
}
}
TupleQueryResultWriter writer = QueryResultIO.createWriter(resultFormat, os);
- if(resultFormat.equals(SPARQLResultsHTMLFormat.SPARQL_RESULTS_HTML)) {
+ if(writer.getSupportedSettings().contains(SPARQLHTMLSettings.TEMPLATING_SERVICE)) {
writer.getWriterConfig().set(SPARQLHTMLSettings.TEMPLATING_SERVICE, templatingService);
}
return writer;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/513b24ce/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java
index 9cf348e..83b214a 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java
@@ -22,6 +22,7 @@ import java.io.OutputStreamWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -38,6 +39,9 @@ import org.openrdf.rio.WriterConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import edu.emory.mathcs.backport.java.util.Arrays;
+import edu.emory.mathcs.backport.java.util.Collections;
+
/**
* SPARQL results to HTML writer usong Freemarker
*
@@ -53,6 +57,15 @@ public class SPARQLResultsHTMLWriter extends TupleQueryResultHandlerBase impleme
private static final String END_TEMPLATE = "sparql_select_end.ftl";
+ private static final Collection<RioSetting<?>> SUPPORTED_SETTINGS;
+
+ static
+ {
+ HashSet<RioSetting<?>> tempSettings = new HashSet<RioSetting<?>>();
+ tempSettings.add(SPARQLHTMLSettings.TEMPLATING_SERVICE);
+ SUPPORTED_SETTINGS = Collections.unmodifiableSet(tempSettings);
+ }
+
private OutputStream out;
private List<String> vars;
@@ -176,7 +189,7 @@ public class SPARQLResultsHTMLWriter extends TupleQueryResultHandlerBase impleme
*/
@Override
public Collection<RioSetting<?>> getSupportedSettings() {
- return new ArrayList<RioSetting<?>>();
+ return SUPPORTED_SETTINGS;
}
/**