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

NIHVIVO-3946 fixes incorrect listing of individuals asserted to be in class

Browse source
This commit is contained in:
brianjlowe 2012-09-10 20:11:37 +00:00
parent c3ebf8eb49
commit b90d1ebefe
1 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
View file

@ -2,6 +2,7 @@
package edu.cornell.mannlib.vitro.webapp.dao.jena; package edu.cornell.mannlib.vitro.webapp.dao.jena;
import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date; 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.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution; import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; 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.AnonId;
import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Property; 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.VitroVocabulary;
import edu.cornell.mannlib.vitro.webapp.dao.jena.IndividualSDB.IndividualNotFoundException; 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.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; import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase;
public class IndividualDaoSDB extends IndividualDaoJena { public class IndividualDaoSDB extends IndividualDaoJena {
@ -177,9 +181,16 @@ public class IndividualDaoSDB extends IndividualDaoJena {
" ?ind <" + RDFS.label.getURI() + "> ?label \n" + " ?ind <" + RDFS.label.getURI() + "> ?label \n" +
"} \n" + "} \n" +
"} ORDER BY ?ind ?label"; "} ORDER BY ?ind ?label";
ResultSet rs =QueryExecutionFactory.create( RDFService rdfService = wadf.getRDFService();
QueryFactory.create(query), dataset) InputStream in = null;
.execSelect(); 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 uri = null;
String label = null; String label = null;
while (rs.hasNext()) { while (rs.hasNext()) {
@ -232,9 +243,16 @@ public class IndividualDaoSDB extends IndividualDaoJena {
"{ ?ind a <" + theClass.getURI() + "> } \n" + "{ ?ind a <" + theClass.getURI() + "> } \n" +
" } \n" + filterStr + " } \n" + filterStr +
"} ORDER BY ?ind"; "} ORDER BY ?ind";
ResultSet rs =QueryExecutionFactory.create( RDFService rdfService = wadf.getRDFService();
QueryFactory.create(query), dataset) InputStream in = null;
.execSelect(); 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()) { while (rs.hasNext()) {
QuerySolution sol = rs.nextSolution(); QuerySolution sol = rs.nextSolution();
Resource currRes = sol.getResource("ind"); Resource currRes = sol.getResource("ind");