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

Updates for page management, including updating link to menu ordering on page list, updating internal class server side logic to correctly instantiate objects when editing an internal class page (previously json object was passed but wasn't needed so removed from constructor), also updated client-side script to correctly populate internal class/class group section and other client-side interactions

Browse source
This commit is contained in:
hjkhjk54 2012-06-25 17:34:25 +00:00
parent 16f860e515
commit c46b148535
10 changed files with 296 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,18 +32,12 @@ import net.sf.json.JSONSerializer;
//Returns the appropriate n3 for selection of classes from within class group
public class ProcessIndividualsForClassesDataGetterN3 extends ProcessClassGroupDataGetterN3 {
private static String classType = "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter";
protected JSONObject values = null;
int classCount = 0;
protected static String individualClassVarNameBase = "classesSelectedInClassGroup";
private Log log = LogFactory.getLog(ProcessIndividualsForClassesDataGetterN3.class);
public ProcessIndividualsForClassesDataGetterN3(JSONObject jsonObject){
this.values = jsonObject;
if(values != null && values.containsKey(individualClassVarNameBase)) {
//Check how many individual classes are in json object
JSONArray ja = values.getJSONArray(individualClassVarNameBase);
classCount = ja.size();
}
public ProcessIndividualsForClassesDataGetterN3(){
}
//Pass in variable that represents the counter
@ -71,14 +65,7 @@ public class ProcessIndividualsForClassesDataGetterN3 extends ProcessClassGroup
String n3 = dataGetterVar + " <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ";
//Consider a multi-valued field - in this case single field with multiple values
n3 += getN3VarName(individualClassVarNameBase, counter);
/*
int i;
for(i = 0; i < classCount; i++) {
if(i != 0) {
n3+= ",";
}
n3 += getN3VarName(individualClassVarNameBase + counter, classCount);
}*/
n3 += " .";
return n3;
@ -230,7 +217,7 @@ public class ProcessIndividualsForClassesDataGetterN3 extends ProcessClassGroup
jObject.element("classGroup", classGroupURI);
//this is a json array
jObject.element("classesSelectedInClassGroup", individualsForClasses);
jObject.element(individualClassVarNameBase, individualsForClasses);
} catch(Exception ex) {
log.error("Exception occurred in retrieving existing values with query " + querystr, ex);
}