From 9c2c22edfd3d54b99383045518cd87d2fddb3a3c Mon Sep 17 00:00:00 2001 From: bjl23 Date: Tue, 5 Oct 2010 20:44:48 +0000 Subject: [PATCH] fix to long-standing bug where entity counts not populated by non-filtering DAO --- .../mannlib/vitro/webapp/dao/jena/VClassDaoJena.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java index e7529b798..807b38798 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java @@ -787,7 +787,11 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { VClass vcw = (VClass) getVClassByURI(cls.getURI()); if (vcw != null) { 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 // SPARQL and LIMIT 1 if SDB can take advantage of it ClosableIterator countIt = getOntModel().listStatements(null,RDF.type,cls); @@ -799,7 +803,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao { countIt.close(); } } - //vcw.setEntityCount(count); + if (includeUninstantiatedClasses || classIsInstantiated) { group.add(vcw); }