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

merging avoidance of entity counts to trunk

Browse source
This commit is contained in:
bjl23 2010-09-16 21:22:16 +00:00
parent e04b50e459
commit 0d93be55d4
5 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/BrowseController.java
View file

@ -120,7 +120,7 @@ public class BrowseController extends VitroHttpServlet {
if( grp == null ){ if( grp == null ){
log.debug("needed to build vclassGroups for portal " + portalId); log.debug("needed to build vclassGroups for portal " + portalId);
// Get all classgroups, each populated with a list of their member vclasses // Get all classgroups, each populated with a list of their member vclasses
List groups = vcgDao.getPublicGroupsWithVClasses(ORDER_BY_DISPLAYRANK, !INCLUDE_UNINSTANTIATED); List groups = vcgDao.getPublicGroupsWithVClasses(ORDER_BY_DISPLAYRANK, !INCLUDE_UNINSTANTIATED, INCLUDE_ENTITY_COUNT);
// now cull out the groups with no populated classes // now cull out the groups with no populated classes
//removeUnpopulatedClasses( groups); //removeUnpopulatedClasses( groups);
@ -135,6 +135,7 @@ public class BrowseController extends VitroHttpServlet {
private static boolean ORDER_BY_DISPLAYRANK = true; private static boolean ORDER_BY_DISPLAYRANK = true;
private static boolean INCLUDE_UNINSTANTIATED = true; private static boolean INCLUDE_UNINSTANTIATED = true;
private static boolean INCLUDE_ENTITY_COUNT = true;
// private void removeUnpopulatedClasses( List<VClassGroup> groups){ // private void removeUnpopulatedClasses( List<VClassGroup> groups){
// if( groups == null || groups.size() == 0 ) return; // if( groups == null || groups.size() == 0 ) return;

3
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java
View file

@ -119,7 +119,7 @@ public class BrowseController extends FreemarkerHttpServlet {
if( grp == null ){ if( grp == null ){
log.debug("needed to build vclassGroups for portal " + portalId); log.debug("needed to build vclassGroups for portal " + portalId);
// Get all classgroups, each populated with a list of their member vclasses // Get all classgroups, each populated with a list of their member vclasses
List groups = vcgDao.getPublicGroupsWithVClasses(ORDER_BY_DISPLAYRANK, !INCLUDE_UNINSTANTIATED); List groups = vcgDao.getPublicGroupsWithVClasses(ORDER_BY_DISPLAYRANK, !INCLUDE_UNINSTANTIATED, INCLUDE_INDIVIDUAL_COUNT);
// remove classes that have been configured to be hidden // remove classes that have been configured to be hidden
// from search results // from search results
@ -156,6 +156,7 @@ public class BrowseController extends FreemarkerHttpServlet {
private static boolean ORDER_BY_DISPLAYRANK = true; private static boolean ORDER_BY_DISPLAYRANK = true;
private static boolean INCLUDE_UNINSTANTIATED = true; private static boolean INCLUDE_UNINSTANTIATED = true;
private static boolean INCLUDE_INDIVIDUAL_COUNT = true;
// private void removeUnpopulatedClasses( List<VClassGroup> groups){ // private void removeUnpopulatedClasses( List<VClassGroup> groups){
// if( groups == null || groups.size() == 0 ) return; // if( groups == null || groups.size() == 0 ) return;

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassGroupDaoFiltering.java
View file

@ -59,7 +59,7 @@ public class VClassGroupDaoFiltering extends BaseFiltering implements VClassGrou
return this.getPublicGroupsWithVClasses(displayOrder,true); return this.getPublicGroupsWithVClasses(displayOrder,true);
} }
public List getPublicGroupsWithVClasses(boolean displayOrder, boolean includeUninstantiatedClasses) { public List getPublicGroupsWithVClasses(boolean displayOrder, boolean includeUninstantiatedClasses) {
return this.getPublicGroupsWithVClasses(displayOrder,includeUninstantiatedClasses,true); return this.getPublicGroupsWithVClasses(displayOrder,includeUninstantiatedClasses,false);
} }
/** filter both vclassgroups and their vclasses */ /** filter both vclassgroups and their vclasses */
public List getPublicGroupsWithVClasses(boolean displayOrder, boolean includeUninstantiatedClasses, public List getPublicGroupsWithVClasses(boolean displayOrder, boolean includeUninstantiatedClasses,

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

@ -788,6 +788,7 @@ 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) {
// 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);
@ -798,6 +799,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
} finally { } finally {
countIt.close(); countIt.close();
} }
}
//vcw.setEntityCount(count); //vcw.setEntityCount(count);
if (includeUninstantiatedClasses || classIsInstantiated) { if (includeUninstantiatedClasses || classIsInstantiated) {
group.add(vcw); group.add(vcw);

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java
View file

@ -112,7 +112,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
} }
public List getPublicGroupsWithVClasses(boolean displayOrder, boolean includeUninstantiatedClasses) { public List getPublicGroupsWithVClasses(boolean displayOrder, boolean includeUninstantiatedClasses) {
return getPublicGroupsWithVClasses(displayOrder, includeUninstantiatedClasses, true); return getPublicGroupsWithVClasses(displayOrder, includeUninstantiatedClasses, false);
} }
public List getPublicGroupsWithVClasses(boolean displayOrder, boolean includeUninstantiatedClasses, public List getPublicGroupsWithVClasses(boolean displayOrder, boolean includeUninstantiatedClasses,