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

fixed error in ProcessInternalClassDataGetterN3 after deleting JSON object from constructor in previous update. Also updated web.xml to remove Menu Management class paths that are no longer used.

Browse source
This commit is contained in:
hjkhjk54 2012-06-26 17:49:31 +00:00
parent 61d77d16c7
commit 35747e8eb8
3 changed files with 16 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
productMods/WEB-INF/web.xml
View file

@ -231,15 +231,6 @@
<url-pattern>/sdbsetup</url-pattern> <url-pattern>/sdbsetup</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>MenuN3EditController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.MenuN3EditController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>MenuN3EditController</servlet-name>
<url-pattern>/menuN3Editor</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>DeletePropertyController</servlet-name> <servlet-name>DeletePropertyController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.DeletePropertyController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.DeletePropertyController</servlet-class>
@ -267,15 +258,6 @@
<url-pattern>/deletePageController</url-pattern> <url-pattern>/deletePageController</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>MenuManagementController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.MenuManagementController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>MenuManagementController</servlet-name>
<url-pattern>/menuManagementController</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>MenuManagementEdit</servlet-name> <servlet-name>MenuManagementEdit</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.MenuManagementEdit</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.MenuManagementEdit</servlet-class>

13
productMods/js/menupage/processInternalClassDataGetterContent.js
View file

@ -36,11 +36,14 @@ var processInternalClassDataGetterContent = {
var classesSelected = existingContentObject["classesSelectedInClassGroup"]; var classesSelected = existingContentObject["classesSelectedInClassGroup"];
var numberSelected = classesSelected.length; var numberSelected = classesSelected.length;
var i; var i;
//Uncheck all since default is checked //Uncheck all since default is checked - but only if classesSelected is nonempty -
pageContentSection.find("input[name='classInClassGroup']").removeAttr("checked"); //if no individual classes returned, then assume entire class group is selected
for(i = 0; i < numberSelected; i++) { if(numberSelected > 0) {
var classSelected = classesSelected[i]; pageContentSection.find("input[name='classInClassGroup']").removeAttr("checked");
pageContentSection.find("input[name='classInClassGroup'][value='" + classSelected + "']").attr("checked", "checked"); for(i = 0; i < numberSelected; i++) {
var classSelected = classesSelected[i];
pageContentSection.find("input[name='classInClassGroup'][value='" + classSelected + "']").attr("checked", "checked");
}
} }
//internal class //internal class
var isInternal = existingContentObject["isInternal"]; var isInternal = existingContentObject["isInternal"];

14
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessInternalClassDataGetterN3.java
View file

@ -156,10 +156,10 @@ public class ProcessInternalClassDataGetterN3 extends ProcessIndividualsForClas
//?dataGetter a FixedHTMLDataGetter ; display:saveToVar ?saveToVar; display:htmlValue ?htmlValue . //?dataGetter a FixedHTMLDataGetter ; display:saveToVar ?saveToVar; display:htmlValue ?htmlValue .
protected String getExistingValuesInternalClass(String dataGetterURI) { protected String getExistingValuesInternalClass(String dataGetterURI) {
String query = this.getSparqlPrefix() + "SELECT ?classGroup ?individualForClass ?internalClass WHERE {" + String query = this.getSparqlPrefix() + " SELECT ?classGroup ?individualForClass ?internalClass WHERE {" +
"<" + dataGetterURI + "> <" + DisplayVocabulary.FOR_CLASSGROUP + "> ?classGroup . \n" + "<" + dataGetterURI + "> <" + DisplayVocabulary.FOR_CLASSGROUP + "> ?classGroup . \n" +
"<" + dataGetterURI + "> <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?individualForClass . \n" + "OPTIONAL {<" + dataGetterURI + "> <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?individualForClass . }\n" +
"OPTIONAL {<" + dataGetterURI + "> <" + DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL + "> ?internaClass .} \n" + "OPTIONAL {<" + dataGetterURI + "> <" + DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL + "> ?internalClass .} \n" +
"}"; "}";
return query; return query;
} }
@ -191,9 +191,11 @@ public class ProcessInternalClassDataGetterN3 extends ProcessIndividualsForClas
Resource classGroupResource = qs.getResource("classGroup"); Resource classGroupResource = qs.getResource("classGroup");
classGroupURI = classGroupResource.getURI(); classGroupURI = classGroupResource.getURI();
} }
//individuals for classes //individuals for classes - this may also be optional in case entire class group selected and internal class
Resource individualForClassResource = qs.getResource("individualForClass"); if(qs.get("individualForClassResource") != null ) {
individualsForClasses.add(individualForClassResource.getURI()); Resource individualForClassResource = qs.getResource("individualForClass");
individualsForClasses.add(individualForClassResource.getURI());
}
//Put both literals in existing literals //Put both literals in existing literals
//If internal class value is present and we have not already saved it in a previous result iteration //If internal class value is present and we have not already saved it in a previous result iteration
if(qs.get("internalClass") != null && internalClassLiteral == null) { if(qs.get("internalClass") != null && internalClassLiteral == null) {