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

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.

Browse source
This commit is contained in:
hjkhjk54 2012-08-16 21:17:40 +00:00
parent cdd10b24f1
commit 34858fcadb
4 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
solr/homeDirectoryTemplate/conf/schema.xml
View file

@ -251,6 +251,10 @@
<!-- nameLowercaseSingleValued is not copied from nameRaw becasue nameRaw might have multiple values --> <!-- nameLowercaseSingleValued is not copied from nameRaw becasue nameRaw might have multiple values -->
<!-- **************************** End Vitro Fields *************************** --> <!-- **************************** 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"/> <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
</fields> </fields>

7
webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ContextNodeFields.java
View file

@ -57,7 +57,10 @@ public class ContextNodeFields implements DocumentModifier{
return; return;
log.debug( "processing context nodes for: " + individual.getURI()); 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 */ /* get text from the context nodes and add the to ALLTEXT */
StringBuffer values = executeQueryForValues(individual, queries); StringBuffer values = executeQueryForValues(individual, queries);
@ -86,7 +89,7 @@ public class ContextNodeFields implements DocumentModifier{
String subInUriQuery = String subInUriQuery =
query.replaceAll("\\?uri", "<" + individual.getURI() + "> "); query.replaceAll("\\?uri", "<" + individual.getURI() + "> ");
log.debug("Subbed in URI query: " + subInUriQuery);
try{ try{
ResultSet results = RDFServiceUtils.sparqlSelectQuery(subInUriQuery, rdfService); ResultSet results = RDFServiceUtils.sparqlSelectQuery(subInUriQuery, rdfService);

12
webapp/web/js/menupage/processIndividualsForClassesDataGetterContent.js
View file

@ -37,6 +37,18 @@ var processIndividualsForClassesDataGetterContent = {
var classSelected = classesSelected[i]; var classSelected = classesSelected[i];
pageContentSection.find("input[name='classInClassGroup'][value='" + classSelected + "']").attr("checked", "checked"); 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 //For the label of the content section for editing, need to add additional value
retrieveAdditionalLabelText:function(existingContentObject) { retrieveAdditionalLabelText:function(existingContentObject) {

1
webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
View file

@ -63,7 +63,6 @@
<form id="managePage" method="POST" action="${submitUrl}" role="add page"> <form id="managePage" method="POST" action="${submitUrl}" role="add page">
<input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="1" role="input" /> <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="1" role="input" />
<input type="hidden" id="editKey" name="editKey" value="${editKey}" /> <input type="hidden" id="editKey" name="editKey" value="${editKey}" />
<input type="hidden" id="menuItem" name="menuItem" value="${menuItem}"/>
<h2>${pageHeading}</h2> <h2>${pageHeading}</h2>
<!--Drop down for the types of content possible--> <!--Drop down for the types of content possible-->
<section id="floatRight"> <section id="floatRight">