diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java index caa03da8a..8db4a11d1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java @@ -82,6 +82,7 @@ public class LocalNamespaceClassUtils { defaultNamespace = defaultNamespace.substring(0, lastIndex) + "/ontology/"; return defaultNamespace; } else { + log.error("Default namespace " + defaultNamespace + " should have /individual, returning null for default namespace"); return null; } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/ClassGroupPageData.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/ClassGroupPageData.java index 8017a6485..5212fccad 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/ClassGroupPageData.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/ClassGroupPageData.java @@ -65,7 +65,14 @@ public class ClassGroupPageData implements PageDataGetter{ } } - + log.debug("Retrieved class group " + group.getURI() + " and returning to template"); + //if debug enabled, print out the number of entities within each class in the class gorup + if(log.isDebugEnabled()){ + List groupClasses = group.getVitroClassList(); + for(VClass v: groupClasses) { + log.debug("Class " + v.getName() + " - " + v.getURI() + " has " + v.getEntityCount() + " entities"); + } + } data.put("vClassGroup", group); //may put null //Also add data service url //Hardcoding for now, need a more dynamic way of doing this diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java index f04312183..a3d367957 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java @@ -70,8 +70,9 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{ List restrictClasses = (List) data.get("restrictVClasses"); //if there are restrict classes, then update counts if(restrictClasses.size() > 0) { + log.debug("Restriction classes exist"); List newVClassList = new ArrayList(); - //Iterate through vclasses and get updated counts + //Iterate through vclasses and get updated counts, iterated and saved in same order as initially included for(VClass v: vclassList) { int oldCount = v.getEntityCount(); //Making a copy so as to ensure we don't touch the values in the cache @@ -116,7 +117,7 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{ private void processClassesForDisplay(ServletContext context, HashMap data, List classes) { VClassGroup classesGroup = new VClassGroup(); classesGroup.setURI("displayClasses"); - + log.debug("Processing classes that will be displayed"); List vClasses = new ArrayList(); VClassGroupCache vcgc = VClassGroupCache.getVClassGroupCache(context); @@ -135,7 +136,9 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{ } //Sort these classes Collections.sort(vClasses); + log.debug("Sorting complete for V Classes"); classesGroup.setVitroClassList(vClasses); + log.debug("Returning vitro class list in data for template"); //Set vclass group data.put("vClassGroup", classesGroup); } @@ -172,6 +175,7 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{ restrictClassesArray = urlEncodedRestrictClasses.toArray(restrictClassesArray); //In case just want uris + log.debug("Variable name for including restriction classes " + getRestrictClassesTemplateName()); data.put(getRestrictClassesTemplateName(), StringUtils.join(restrictClassesArray, ",")); data.put("restrictVClasses", restrictVClasses); //not sure if this is useful diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java index 05c61d40d..17128056e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java @@ -56,10 +56,12 @@ public class InternalClassesDataGetter extends IndividualsForClassesDataGetter{ try{ List classes = (List)classIntersectionsMap.get("classes"); List restrictClasses = retrieveRestrictClasses(context, classIntersectionsMap); + log.debug("Retrieving classes for " + classes.toString() + " and restricting by " + restrictClasses.toString()); processClassesAndRestrictions(vreq, context, data, classes, restrictClasses); //Also add data service url //Hardcoding for now, need a more dynamic way of doing this data.put("dataServiceUrlIndividualsByVClass", this.getDataServiceUrl()); + log.debug("Using data service url " + this.getDataServiceUrl()); } catch(Exception ex) { log.error("An error occurred retrieving Vclass Intersection individuals", ex); }