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

switching the sparql query servlet back to using the unfiltered RDF service

Browse source
This commit is contained in:
brianjlowe 2013-09-26 14:28:22 -04:00
parent b970fb42d8
commit 9533717b32
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java
View file

@ -104,6 +104,10 @@ public class SparqlQueryServlet extends BaseEditController {
doNoModelInContext(response); doNoModelInContext(response);
return; return;
} }
// Use RDFService from context to avoid language filtering
RDFService rdfService = RDFServiceUtils.getRDFServiceFactory(
getServletContext()).getRDFService();
String queryParam = vreq.getParameter("query"); String queryParam = vreq.getParameter("query");
log.debug("queryParam was : " + queryParam); log.debug("queryParam was : " + queryParam);
@ -119,16 +123,16 @@ public class SparqlQueryServlet extends BaseEditController {
if( query.isSelectType() ){ if( query.isSelectType() ){
String format = contentType!=null ? contentType:vreq.getParameter("resultFormat"); String format = contentType!=null ? contentType:vreq.getParameter("resultFormat");
RSFormatConfig formatConf = rsFormats.get(format); RSFormatConfig formatConf = rsFormats.get(format);
doSelect(response, queryParam, formatConf, vreq.getRDFService()); doSelect(response, queryParam, formatConf, rdfService);
}else if( query.isAskType()){ }else if( query.isAskType()){
doAsk( queryParam, vreq.getRDFService(), response ); doAsk( queryParam, rdfService, response );
}else if( query.isConstructType() ){ }else if( query.isConstructType() ){
String format = contentType != null ? contentType : vreq.getParameter("rdfResultFormat"); String format = contentType != null ? contentType : vreq.getParameter("rdfResultFormat");
if (format== null) { if (format== null) {
format= "RDF/XML-ABBREV"; format= "RDF/XML-ABBREV";
} }
ModelFormatConfig formatConf = modelFormats.get(format); ModelFormatConfig formatConf = modelFormats.get(format);
doConstruct(response, query, formatConf, vreq.getRDFService()); doConstruct(response, query, formatConf, rdfService);
}else{ }else{
doHelp(request,response); doHelp(request,response);
} }