litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of git://github.com/vivo-project/Vitro into develop

Browse source
This commit is contained in:
Jim Blake 2017-12-01 09:37:59 -05:00
commit 17155d4f21
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java
View file

@ -96,6 +96,7 @@ public class SparqlQueryController extends FreemarkerHttpServlet {
SimplePermission.USE_SPARQL_QUERY_PAGE.ACTION)) { SimplePermission.USE_SPARQL_QUERY_PAGE.ACTION)) {
return; return;
} }
resp.addHeader("X-XSS-Protection", "0");
if (req.getParameterMap().containsKey("query")) { if (req.getParameterMap().containsKey("query")) {
respondToQuery(req, resp); respondToQuery(req, resp);
} else { } else {

5
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
View file

@ -106,7 +106,10 @@ public class JenaExportController extends BaseEditController {
String formatParam = vreq.getParameter("format"); String formatParam = vreq.getParameter("format");
String subgraphParam = vreq.getParameter("subgraph"); String subgraphParam = vreq.getParameter("subgraph");
String assertedOrInferredParam = vreq.getParameter("assertedOrInferred"); String assertedOrInferredParam = vreq.getParameter("assertedOrInferred");
StringBuilder ontologyURI = new StringBuilder(vreq.getParameter("ontologyURI")); StringBuilder ontologyURI = new StringBuilder();
if (vreq.getParameter("ontologyURI") != null) {
ontologyURI.append(vreq.getParameter("ontologyURI"));
}
Model model = null; Model model = null;
OntModel ontModel = ModelFactory.createOntologyModel(); OntModel ontModel = ModelFactory.createOntologyModel();