From b90d1ebefe169b7bbf0550a76ebec8293c6cd3b8 Mon Sep 17 00:00:00 2001
From: brianjlowe <brianjlowe@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 10 Sep 2012 20:11:37 +0000
Subject: [PATCH] NIHVIVO-3946 fixes incorrect listing of individuals asserted
 to be in class

---
 .../webapp/dao/jena/IndividualDaoSDB.java     | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
index 4c9c3e61c..7b7ec4281 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
@@ -2,6 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -25,6 +26,7 @@ import com.hp.hpl.jena.query.QueryExecutionFactory;
 import com.hp.hpl.jena.query.QueryFactory;
 import com.hp.hpl.jena.query.QuerySolution;
 import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.query.ResultSetFactory;
 import com.hp.hpl.jena.rdf.model.AnonId;
 import com.hp.hpl.jena.rdf.model.Literal;
 import com.hp.hpl.jena.rdf.model.Property;
@@ -43,6 +45,8 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.IndividualSDB.IndividualNotFoundException;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactorySDB.SDBDatasetMode;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase;
 
 public class IndividualDaoSDB extends IndividualDaoJena {
@@ -177,9 +181,16 @@ public class IndividualDaoSDB extends IndividualDaoJena {
 	    		 	"    ?ind  <" + RDFS.label.getURI() + "> ?label \n" +
 	    		 	"} \n" +
 	    		 "} ORDER BY ?ind ?label";
-    		ResultSet rs =QueryExecutionFactory.create(
-    		        QueryFactory.create(query), dataset)
-    		        .execSelect();
+            RDFService rdfService = wadf.getRDFService();
+            InputStream in = null;
+            try {
+                in = rdfService.sparqlSelectQuery(
+                        query, RDFService.ResultFormat.JSON);
+            } catch (RDFServiceException e) {
+                log.debug(e,e);
+                throw new RuntimeException(e);
+            }
+            ResultSet rs = ResultSetFactory.fromJSON(in);
     		String uri = null;
     		String label = null;
     		while (rs.hasNext()) {
@@ -232,9 +243,16 @@ public class IndividualDaoSDB extends IndividualDaoJena {
                 	"{   ?ind a <" + theClass.getURI() + "> } \n" +
                 "  } \n" + filterStr +
                 "} ORDER BY ?ind";
-    		ResultSet rs =QueryExecutionFactory.create(
-    		        QueryFactory.create(query), dataset)
-    		        .execSelect();
+    		RDFService rdfService = wadf.getRDFService();
+    		InputStream in = null;
+    		try {
+    		    in = rdfService.sparqlSelectQuery(
+    		            query, RDFService.ResultFormat.JSON);
+    		} catch (RDFServiceException e) {
+    		    log.debug(e,e);
+    		    throw new RuntimeException(e);
+    		}
+    		ResultSet rs = ResultSetFactory.fromJSON(in);
     		while (rs.hasNext()) {
     		    QuerySolution sol = rs.nextSolution();
     		    Resource currRes = sol.getResource("ind");