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

page management: updates to allow for class group content to change to internal class/selected classes and vice versa.

Browse source
This commit is contained in:
hjkhjk54 2012-08-30 17:53:35 +00:00
parent 67449f6eea
commit 3bed795ea4
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,6 +104,8 @@ public class ProcessInternalClassDataGetterN3 extends ProcessIndividualsForClas
//First, put dataGetterURI within scope as well //First, put dataGetterURI within scope as well
//((ProcessDataGetterAbstract)this).populateExistingDataGetterURI(dataGetterURI, counter); //((ProcessDataGetterAbstract)this).populateExistingDataGetterURI(dataGetterURI, counter);
this.populateExistingDataGetterURI(dataGetterURI, counter); this.populateExistingDataGetterURI(dataGetterURI, counter);
//Put in type
this.populateExistingClassType(this.getClassType(), counter);
//Sparql queries for values to be executed //Sparql queries for values to be executed
//And then placed in the correct place/literal or uri //And then placed in the correct place/literal or uri
String querystr = getExistingValuesInternalClass(dataGetterURI); String querystr = getExistingValuesInternalClass(dataGetterURI);
@ -132,7 +134,7 @@ public class ProcessInternalClassDataGetterN3 extends ProcessIndividualsForClas
if(qs.get("internalClass") != null && internalClassLiteral == null) { if(qs.get("internalClass") != null && internalClassLiteral == null) {
internalClassLiteral= qs.getLiteral("internalClass"); internalClassLiteral= qs.getLiteral("internalClass");
existingLiteralValues.put(this.getVarName("internalClass", counter), existingLiteralValues.put(this.getVarName(internalClassVarNameBase, counter),
new ArrayList<Literal>(Arrays.asList(internalClassLiteral))); new ArrayList<Literal>(Arrays.asList(internalClassLiteral)));
} }
} }
@ -141,7 +143,7 @@ public class ProcessInternalClassDataGetterN3 extends ProcessIndividualsForClas
new ArrayList<String>(individualsForClasses)); new ArrayList<String>(individualsForClasses));
//Final check, in case no internal class flag was returned, set to false //Final check, in case no internal class flag was returned, set to false
if(internalClassLiteral == null) { if(internalClassLiteral == null) {
existingLiteralValues.put(this.getVarName("internalClass", counter), existingLiteralValues.put(this.getVarName(internalClassVarNameBase, counter),
new ArrayList<Literal>( new ArrayList<Literal>(
Arrays.asList(ResourceFactory.createPlainLiteral("false")) Arrays.asList(ResourceFactory.createPlainLiteral("false"))
)); ));
@ -168,6 +170,8 @@ public class ProcessInternalClassDataGetterN3 extends ProcessIndividualsForClas
public JSONObject getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) { public JSONObject getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
JSONObject jObject = new JSONObject(); JSONObject jObject = new JSONObject();
jObject.element("dataGetterClass", classType); jObject.element("dataGetterClass", classType);
//Update to include class type as variable
jObject.element(classTypeVarBase, classType);
//Get selected class group, if internal class, and classes selected from class group //Get selected class group, if internal class, and classes selected from class group
getExistingClassGroupAndInternalClass(dataGetterURI, jObject, queryModel); getExistingClassGroupAndInternalClass(dataGetterURI, jObject, queryModel);
//Get all classes in the class group //Get all classes in the class group