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

fix to long-standing bug where entity counts not populated by non-filtering DAO

Browse source
This commit is contained in:
bjl23 2010-10-05 20:44:48 +00:00
parent a3472b4fe8
commit 9c2c22edfd
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java
View file

@ -787,7 +787,11 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
VClass vcw = (VClass) getVClassByURI(cls.getURI()); VClass vcw = (VClass) getVClassByURI(cls.getURI());
if (vcw != null) { if (vcw != null) {
boolean classIsInstantiated = false; boolean classIsInstantiated = false;
if (includeUninstantiatedClasses == false) { if (getIndividualCount) {
int count = getOntModel().listStatements(null,RDF.type,cls).toList().size();
vcw.setEntityCount(count);
classIsInstantiated = (count > 0);
} else if (includeUninstantiatedClasses == false) {
// Note: to support SDB models, may want to do this with // Note: to support SDB models, may want to do this with
// SPARQL and LIMIT 1 if SDB can take advantage of it // SPARQL and LIMIT 1 if SDB can take advantage of it
ClosableIterator countIt = getOntModel().listStatements(null,RDF.type,cls); ClosableIterator countIt = getOntModel().listStatements(null,RDF.type,cls);
@ -799,7 +803,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
countIt.close(); countIt.close();
} }
} }
//vcw.setEntityCount(count);
if (includeUninstantiatedClasses || classIsInstantiated) { if (includeUninstantiatedClasses || classIsInstantiated) {
group.add(vcw); group.add(vcw);
} }