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

NIHVIVO-1450 Check to see if sparql query has graph variable.

Browse source
This commit is contained in:
ass92 2010-12-23 20:47:00 +00:00
parent 47e2108923
commit 439be80fa3
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,7 @@ import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.StringTokenizer;
import javax.servlet.RequestDispatcher; import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException; import javax.servlet.ServletException;
@ -147,9 +148,18 @@ public class SparqlQueryServlet extends BaseEditController {
if (!modelMap.isEmpty()) { if (!modelMap.isEmpty()) {
return buildDataSetFromNamedModels(modelMap); 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(); Dataset dataset = vreq.getDataset();
if (dataset != null) { if (dataset != null && graphPresent) {
return dataset; return dataset;
} }