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

Updating logging for NIHVIVO-3015 and NIHVIVO-2999

Browse source
This commit is contained in:
hjkhjk54 2011-07-21 15:16:24 +00:00
parent fd945e97ad
commit 6833284706
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
View file

@ -82,6 +82,7 @@ public class LocalNamespaceClassUtils {
defaultNamespace = defaultNamespace.substring(0, lastIndex) + "/ontology/"; defaultNamespace = defaultNamespace.substring(0, lastIndex) + "/ontology/";
return defaultNamespace; return defaultNamespace;
} else { } else {
log.error("Default namespace " + defaultNamespace + " should have /individual, returning null for default namespace");
return null; return null;
} }
} }

9
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/ClassGroupPageData.java
View file

@ -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<VClass> 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 data.put("vClassGroup", group); //may put null
//Also add data service url //Also add data service url
//Hardcoding for now, need a more dynamic way of doing this //Hardcoding for now, need a more dynamic way of doing this

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

@ -70,8 +70,9 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{
List<VClass> restrictClasses = (List<VClass>) data.get("restrictVClasses"); List<VClass> restrictClasses = (List<VClass>) data.get("restrictVClasses");
//if there are restrict classes, then update counts //if there are restrict classes, then update counts
if(restrictClasses.size() > 0) { if(restrictClasses.size() > 0) {
log.debug("Restriction classes exist");
List<VClass> newVClassList = new ArrayList<VClass>(); List<VClass> newVClassList = new ArrayList<VClass>();
//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) { for(VClass v: vclassList) {
int oldCount = v.getEntityCount(); int oldCount = v.getEntityCount();
//Making a copy so as to ensure we don't touch the values in the cache //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<String, Object> data, List<String> classes) { private void processClassesForDisplay(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");
List<VClass> vClasses = new ArrayList<VClass>(); List<VClass> vClasses = new ArrayList<VClass>();
VClassGroupCache vcgc = VClassGroupCache.getVClassGroupCache(context); VClassGroupCache vcgc = VClassGroupCache.getVClassGroupCache(context);
@ -135,7 +136,9 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{
} }
//Sort these classes //Sort these classes
Collections.sort(vClasses); Collections.sort(vClasses);
log.debug("Sorting complete for V Classes");
classesGroup.setVitroClassList(vClasses); classesGroup.setVitroClassList(vClasses);
log.debug("Returning vitro class list in data for template");
//Set vclass group //Set vclass group
data.put("vClassGroup", classesGroup); data.put("vClassGroup", classesGroup);
} }
@ -172,6 +175,7 @@ public class IndividualsForClassesDataGetter implements PageDataGetter{
restrictClassesArray = urlEncodedRestrictClasses.toArray(restrictClassesArray); restrictClassesArray = urlEncodedRestrictClasses.toArray(restrictClassesArray);
//In case just want uris //In case just want uris
log.debug("Variable name for including restriction classes " + getRestrictClassesTemplateName());
data.put(getRestrictClassesTemplateName(), StringUtils.join(restrictClassesArray, ",")); data.put(getRestrictClassesTemplateName(), StringUtils.join(restrictClassesArray, ","));
data.put("restrictVClasses", restrictVClasses); data.put("restrictVClasses", restrictVClasses);
//not sure if this is useful //not sure if this is useful

2
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/InternalClassesDataGetter.java
View file

@ -56,10 +56,12 @@ public class InternalClassesDataGetter extends IndividualsForClassesDataGetter{
try{ try{
List<String> classes = (List<String>)classIntersectionsMap.get("classes"); List<String> classes = (List<String>)classIntersectionsMap.get("classes");
List<String> restrictClasses = retrieveRestrictClasses(context, classIntersectionsMap); List<String> restrictClasses = retrieveRestrictClasses(context, classIntersectionsMap);
log.debug("Retrieving classes for " + classes.toString() + " and restricting by " + restrictClasses.toString());
processClassesAndRestrictions(vreq, context, data, classes, restrictClasses); processClassesAndRestrictions(vreq, context, data, classes, restrictClasses);
//Also add data service url //Also add data service url
//Hardcoding for now, need a more dynamic way of doing this //Hardcoding for now, need a more dynamic way of doing this
data.put("dataServiceUrlIndividualsByVClass", this.getDataServiceUrl()); data.put("dataServiceUrlIndividualsByVClass", this.getDataServiceUrl());
log.debug("Using data service url " + this.getDataServiceUrl());
} catch(Exception ex) { } catch(Exception ex) {
log.error("An error occurred retrieving Vclass Intersection individuals", ex); log.error("An error occurred retrieving Vclass Intersection individuals", ex);
} }