From 34858fcadb706ef74f6c49ca4ed099c74f060caa Mon Sep 17 00:00:00 2001
From: hjkhjk54 <hjkhjk54@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 16 Aug 2012 21:17:40 +0000
Subject: [PATCH] updates for page management as well as some changes to
 schema.xml to enable addition of dynamic fields (for datastar but also
 present if others would like to employ it) - some additional debug lines to
 ContextNodeFields.

---
 solr/homeDirectoryTemplate/conf/schema.xml           |  4 ++++
 .../solr/documentBuilding/ContextNodeFields.java     |  7 +++++--
 .../processIndividualsForClassesDataGetterContent.js | 12 ++++++++++++
 .../freemarker/edit/forms/pageManagement.ftl         |  1 -
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/solr/homeDirectoryTemplate/conf/schema.xml b/solr/homeDirectoryTemplate/conf/schema.xml
index 3e3aef549..710f3b147 100644
--- a/solr/homeDirectoryTemplate/conf/schema.xml
+++ b/solr/homeDirectoryTemplate/conf/schema.xml
@@ -251,6 +251,10 @@
   <!--  nameLowercaseSingleValued is not copied from nameRaw becasue nameRaw might have multiple values -->
      
   <!-- ****************************  End Vitro Fields *************************** -->
+  <!-- ****************************  Dynamic Fields *************************** -->
+  <dynamicField name="*_string" type="string" indexed="true" stored="true" />
+   <!-- ****************************  End Dynamic Fields *************************** -->
+  
    
    <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>     
  </fields>
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ContextNodeFields.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ContextNodeFields.java
index e0c442f9e..bee1be521 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ContextNodeFields.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ContextNodeFields.java
@@ -57,7 +57,10 @@ public class ContextNodeFields implements DocumentModifier{
             return;
         
         log.debug( "processing context nodes for: " +  individual.getURI());
-        
+        log.debug( "queries are ");
+        for(String q:queries) {
+        	log.debug("Query: " + q);
+        }
         /* get text from the context nodes and add the to ALLTEXT */        
         StringBuffer values = executeQueryForValues(individual, queries);        
         
@@ -86,7 +89,7 @@ public class ContextNodeFields implements DocumentModifier{
         	
             String subInUriQuery = 
         		query.replaceAll("\\?uri", "<" + individual.getURI() + "> ");
-        	
+        	log.debug("Subbed in URI query: " + subInUriQuery);
             try{
             	
             	ResultSet results = RDFServiceUtils.sparqlSelectQuery(subInUriQuery, rdfService);               
diff --git a/webapp/web/js/menupage/processIndividualsForClassesDataGetterContent.js b/webapp/web/js/menupage/processIndividualsForClassesDataGetterContent.js
index 873121910..39b745d9e 100644
--- a/webapp/web/js/menupage/processIndividualsForClassesDataGetterContent.js
+++ b/webapp/web/js/menupage/processIndividualsForClassesDataGetterContent.js
@@ -37,6 +37,18 @@ var processIndividualsForClassesDataGetterContent = {
 			var classSelected = classesSelected[i];
 			pageContentSection.find("input[name='classInClassGroup'][value='" + classSelected + "']").attr("checked", "checked");
 		}
+		//If number of classes selected is not equal to total number of classes, uncheck all
+		
+		var results =existingContentObject["results"];
+		if(results != null && results.classGroupName != null) {
+	    	var resultsClasses = results["classes"];
+	    	if(resultsClasses != null) {
+	    		var numberClasses = resultsClasses.length;
+	    		if(numberClasses != numberSelected) {
+	    			pageContentSection.find("input[name='allSelected']").removeAttr("checked");
+	    		}
+	    	}
+		}
 	},
 	//For the label of the content section for editing, need to add additional value
 	retrieveAdditionalLabelText:function(existingContentObject) {
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
index e2454dbe1..113b49c61 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
@@ -63,7 +63,6 @@
 	<form id="managePage" method="POST" action="${submitUrl}" role="add page">
 	        <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="1" role="input" />
 	        <input type="hidden" id="editKey" name="editKey" value="${editKey}" />
-			<input type="hidden" id="menuItem" name="menuItem" value="${menuItem}"/>
     <h2>${pageHeading}</h2>
     <!--Drop down for the types of content possible-->
     <section id="floatRight">