From 1ac2d7c65f143d0149bcdda22eca0b45038af745 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 14 Dec 2010 17:43:45 +0000
Subject: [PATCH] NIHVIVO-1363 adapt the controller to use the jenaOntModel
 from the request.

---
 .../ajax/SparqlQueryAjaxController.java           | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
index 2f9414352..2b9c01bde 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
@@ -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);