From d434376bdc16c2cd49c8cd70c0b9fca81e8a7e6b Mon Sep 17 00:00:00 2001
From: hjkhjk54 <hjkhjk54@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 18 Jul 2011 16:12:43 +0000
Subject: [PATCH] updates for debugging and NIHVIVO-2956

---
 .../mannlib/vitro/webapp/controller/JsonServlet.java       | 1 +
 .../vitro/webapp/controller/edit/MenuManagementEdit.java   | 7 ++++++-
 .../vitro/webapp/utils/pageDataGetter/DataGetterUtils.java | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java
index fdede95ce..32e95718a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/JsonServlet.java
@@ -249,6 +249,7 @@ public class JsonServlet extends VitroHttpServlet {
     public static JSONObject getSolrIndividualsByVClasses(List<String> vclassURIs, HttpServletRequest req, ServletContext context) throws Exception {
    	 	VitroRequest vreq = new VitroRequest(req);        
         Map<String, Object> map = getSolrVClassIntersectionResults(vclassURIs, vreq, context);
+        log.info("Results returned from Solr for " + vclassURIs.toString() + " are of size " + map.size());
         JSONObject rObj = processVClassResults(map, vreq, context, true);                    
         return rObj;     
    }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java
index 3ffef8f4f..c774b0676 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java
@@ -83,7 +83,7 @@ public class MenuManagementEdit extends VitroHttpServlet {
     	if(command != null) {
     		processCommand(command, vreq, resp);
     	} else {
-    		System.out.println("Command is null");
+    		log.error("Command is null");
     	}
         //Need to redirect correctly
     	if(!isReorder(command)){
@@ -552,6 +552,11 @@ public class MenuManagementEdit extends VitroHttpServlet {
 					pageResource, 
 					DisplayVocabulary.REQUIRES_BODY_TEMPLATE, 
 					(RDFNode) null));
+			//Also need to get rid of link text in addition to title
+			removeModel.add(displayModel.listStatements(
+					menuItemResource, 
+					DisplayVocabulary.LINK_TEXT,
+					(RDFNode) null));
 		    //remove data getter properties - the link between page and data getter remains
 			Resource dataGetter = getDataGetterFromDisplayModel(pageResource, displayModel);
 			removeModel.add(displayModel.listStatements(dataGetter, null, (RDFNode) null));
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java
index 0943dcb1d..dad079a31 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/DataGetterUtils.java
@@ -189,12 +189,12 @@ public class DataGetterUtils {
                 for(String vclassId: vitroClassIdStr) {
                     vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassId);
                     if (vclass == null) {
-                        log.debug("Couldn't retrieve vclass ");   
+                        log.info("Couldn't retrieve vclass ");   
                         throw new Exception (errorMessage = "Class " + vclassId + " not found");
                     }  
                   }
             }else{
-                log.debug("parameter vclassId URI parameter expected ");
+                log.info("parameter vclassId URI parameter expected ");
                 throw new Exception("parameter vclassId URI parameter expected ");
             }
             List<String> vclassIds = Arrays.asList(vitroClassIdStr);                           
@@ -222,7 +222,7 @@ public class DataGetterUtils {
                 rObj.put("alpha", map.get("alpha"));
                                   
                 List<Individual> inds = (List<Individual>)map.get("entities");
-    
+                log.info("Number of individuals returned from request: " + inds.size());
                 JSONArray jInds = new JSONArray();
                 for(Individual ind : inds ){
                     JSONObject jo = new JSONObject();