NIHVIVO-1363 adapt the controller to use the jenaOntModel from the request.
This commit is contained in:
parent
d76b4bd3bd
commit
1ac2d7c65f
1 changed files with 1 additions and 14 deletions
|
@ -77,23 +77,10 @@ public class SparqlQueryAjaxController extends VitroAjaxController {
|
|||
"Only 'select' queries are allowed.");
|
||||
}
|
||||
|
||||
Dataset dataset = chooseDatasetToQueryAgainst(vreq);
|
||||
|
||||
executeQuery(response, query, dataset);
|
||||
executeQuery(response, query, DatasetFactory.create(model));
|
||||
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,
|
||||
Dataset dataset) throws IOException {
|
||||
QueryExecution qe = QueryExecutionFactory.create(query, dataset);
|
||||
|
|
Loading…
Add table
Reference in a new issue