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

NIHVIVO-2318 removed a few extraneous references to monikers

Browse source
This commit is contained in:
brianjlowe 2011-07-05 19:50:13 +00:00
parent 1fb8fdcc45
commit cfcea88dfe
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,11 +113,11 @@ public class IndividualDaoSDB extends IndividualDaoJena {
// If so, we will use it in a slightly strange way. Unfortunately, // If so, we will use it in a slightly strange way. Unfortunately,
// performance is quite bad if we add several graph variables in // performance is quite bad if we add several graph variables in
// order to account for the fact that an individual's type // order to account for the fact that an individual's type
// declaration may be in a different graph from its label or // declaration may be in a different graph from its label.
// moniker. Thus, we will run two queries: one with a single // Thus, we will run two queries: one with a single
// graph variable to get the list of URIs, and a second against // graph variable to get the list of URIs, and a second against
// the union graph to get individuals with their labels and // the union graph to get individuals with their labels.
// monikers. We will then toss out any individual in the second // We will then toss out any individual in the second
// list that is not also in the first list. // list that is not also in the first list.
// Annoying, yes, but better than the alternative. // Annoying, yes, but better than the alternative.
// Note that both queries need to sort identically or // Note that both queries need to sort identically or
@ -166,7 +166,7 @@ public class IndividualDaoSDB extends IndividualDaoJena {
try { try {
String query = String query =
"SELECT DISTINCT ?ind ?label ?moniker " + "SELECT DISTINCT ?ind ?label " +
"WHERE " + "WHERE " +
"{ \n" + "{ \n" +
"{ ?ind a <" + theClass.getURI() + "> } \n" + "{ ?ind a <" + theClass.getURI() + "> } \n" +
@ -180,7 +180,6 @@ public class IndividualDaoSDB extends IndividualDaoJena {
.execSelect(); .execSelect();
String uri = null; String uri = null;
String label = null; String label = null;
String moniker = null;
while (rs.hasNext()) { while (rs.hasNext()) {
QuerySolution sol = rs.nextSolution(); QuerySolution sol = rs.nextSolution();
Resource currRes = sol.getResource("ind"); Resource currRes = sol.getResource("ind");
@ -223,7 +222,7 @@ public class IndividualDaoSDB extends IndividualDaoJena {
dataset.getLock().enterCriticalSection(Lock.READ); dataset.getLock().enterCriticalSection(Lock.READ);
try { try {
String query = String query =
"SELECT DISTINCT ?ind ?label ?moniker " + "SELECT DISTINCT ?ind " +
"WHERE " + "WHERE " +
"{ GRAPH ?g { \n" + "{ GRAPH ?g { \n" +
"{ ?ind a <" + theClass.getURI() + "> } \n" + "{ ?ind a <" + theClass.getURI() + "> } \n" +