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

Update to allow class to be returned for restrict class where said class is not returned by VClassGroupCache (but does exist). To be consistent, updated VClass retrieval for both regular and restrict class to check dao in case VClassGroupCache does not return class.

Browse source
This commit is contained in:
hjkhjk54 2011-08-18 15:17:52 +00:00
parent ba132317a8
commit 2140afbbae
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java
View file

@ -92,7 +92,7 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{
protected void processClassesAndRestrictions(VitroRequest vreq, ServletContext context, protected void processClassesAndRestrictions(VitroRequest vreq, ServletContext context,
HashMap<String, Object> data, List<String> classes, List<String> restrictClasses ) { HashMap<String, Object> data, List<String> classes, List<String> restrictClasses ) {
processClassesForDisplay(context, data, classes); processClassesForDisplay(vreq, context, data, classes);
processRestrictionClasses(vreq, context, data, restrictClasses); processRestrictionClasses(vreq, context, data, restrictClasses);
processIntersections(vreq, context, data); processIntersections(vreq, context, data);
@ -152,7 +152,7 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{
} }
private void processClassesForDisplay(ServletContext context, HashMap<String, Object> data, List<String> classes) { private void processClassesForDisplay(VitroRequest vreq, ServletContext context, HashMap<String, Object> data, List<String> classes) {
VClassGroup classesGroup = new VClassGroup(); VClassGroup classesGroup = new VClassGroup();
classesGroup.setURI("displayClasses"); classesGroup.setURI("displayClasses");
log.debug("Processing classes that will be displayed"); log.debug("Processing classes that will be displayed");
@ -162,6 +162,10 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{
for(String classUri: classes) { for(String classUri: classes) {
//Retrieve vclass from cache to get the count //Retrieve vclass from cache to get the count
VClass vclass = vcgc.getCachedVClass(classUri); VClass vclass = vcgc.getCachedVClass(classUri);
//if not found in cache, possibly due to not being in any class group
if(vclass == null) {
vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri);
}
if(vclass != null) { if(vclass != null) {
log.debug("VClass does exist for " + classUri + " and entity count is " + vclass.getEntityCount()); log.debug("VClass does exist for " + classUri + " and entity count is " + vclass.getEntityCount());
vClasses.add(vclass); vClasses.add(vclass);
@ -198,6 +202,10 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{
//vclasses to be returned even if switched to display model, although //vclasses to be returned even if switched to display model, although
//uris used within display model editing and not vclass objects //uris used within display model editing and not vclass objects
VClass vclass = vcgc.getCachedVClass(restrictClassUri); VClass vclass = vcgc.getCachedVClass(restrictClassUri);
//if not found in cache, possibly due to not being in any class group
if(vclass == null) {
vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(restrictClassUri);
}
if(vclass != null) { if(vclass != null) {
log.debug("Found restrict class and adding to list " + restrictClassUri); log.debug("Found restrict class and adding to list " + restrictClassUri);
restrictVClasses.add(vclass); restrictVClasses.add(vclass);