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

NIHVIVO-1363 adapt the controller to use the jenaOntModel from the request.

Browse source
This commit is contained in:
jeb228 2010-12-14 17:43:45 +00:00
parent d76b4bd3bd
commit 1ac2d7c65f
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
View file

@ -77,23 +77,10 @@ public class SparqlQueryAjaxController extends VitroAjaxController {
"Only 'select' queries are allowed."); "Only 'select' queries are allowed.");
} }
Dataset dataset = chooseDatasetToQueryAgainst(vreq); executeQuery(response, query, DatasetFactory.create(model));
executeQuery(response, query, dataset);
return; return;
} }
private Dataset chooseDatasetToQueryAgainst(VitroRequest vreq) {
Dataset dataset = vreq.getDataset();
if (dataset != null) {
return dataset;
}
DataSource dataSource = DatasetFactory.create();
dataSource.setDefaultModel(vreq.getJenaOntModel());
return dataSource;
}
private void executeQuery(HttpServletResponse response, Query query, private void executeQuery(HttpServletResponse response, Query query,
Dataset dataset) throws IOException { Dataset dataset) throws IOException {
QueryExecution qe = QueryExecutionFactory.create(query, dataset); QueryExecution qe = QueryExecutionFactory.create(query, dataset);