From 439be80fa3ae570043def7de0c2a400d676bdf53 Mon Sep 17 00:00:00 2001
From: ass92 <ass92@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 23 Dec 2010 20:47:00 +0000
Subject: [PATCH] NIHVIVO-1450 Check to see if sparql query has graph variable.

---
 .../webapp/controller/SparqlQueryServlet.java      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java
index f037f390e..22ec41f97 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java
@@ -13,6 +13,7 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.StringTokenizer;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -147,9 +148,18 @@ public class SparqlQueryServlet extends BaseEditController {
 		if (!modelMap.isEmpty()) {
 			return buildDataSetFromNamedModels(modelMap);
 		}
-
+		
+		String queryParam = vreq.getParameter("query");
+		boolean graphPresent = false;
+		StringTokenizer tokenizer = new StringTokenizer(queryParam, " ");
+	    while(tokenizer.hasMoreTokens()){
+	    	if("graph".equalsIgnoreCase(tokenizer.nextToken())){
+	    		graphPresent = true;
+	    		break;
+	    	}
+	    }
 		Dataset dataset = vreq.getDataset();
-		if (dataset != null) {
+		if (dataset != null && graphPresent) {
 			return dataset;
 		}