Removing assertions from fields
This commit is contained in:
briancaruso
parent
5b1847dd4c
commit
ee90023581
4 changed files with 40 additions and 147 deletions
|
|
@ -63,8 +63,6 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
|
|||
@Override
|
||||
public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
|
||||
EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
|
||||
//Set n3 generator
|
||||
editConfiguration.setN3Generator(new EditN3GeneratorVTwo(editConfiguration));
|
||||
|
||||
//process subject, predicate, object parameters
|
||||
this.initProcessParameters(vreq, session, editConfiguration);
|
||||
|
|
@ -163,10 +161,7 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
|
|||
editConfiguration.setObject(objectUri);
|
||||
//this needs to be set for the editing to be triggered properly, otherwise the 'prepare' method
|
||||
//pretends this is a data property editing statement and throws an error
|
||||
//TODO: Check if null in case no object uri exists but this is still an object property
|
||||
if(objectUri != null) {
|
||||
editConfiguration.setObjectResource(true);
|
||||
}
|
||||
//TODO: Check if null in case no object uri exists but this is still an object property
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -465,7 +460,6 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
|
|||
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName(fieldName);
|
||||
field.setNewResource(false);
|
||||
//queryForExisting is not being used anywhere in Field
|
||||
|
||||
List<String> validators = new ArrayList<String>();
|
||||
|
|
@ -481,10 +475,6 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
|
|||
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
assertions.add(getN3ForGrantRole(vreq));
|
||||
field.setAssertions(assertions);
|
||||
fields.put(field.getName(), field);
|
||||
|
||||
}
|
||||
|
|
@ -497,7 +487,6 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
|
|||
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName(fieldName);
|
||||
field.setNewResource(false);
|
||||
//queryForExisting is not being used anywhere in Field
|
||||
|
||||
//Not really interested in validators here
|
||||
|
|
@ -517,12 +506,7 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
|
|||
field.setRangeDatatypeUri(null);
|
||||
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
assertions.add(getN3ForGrantLabel(vreq));
|
||||
assertions.add(getN3ForGrantRole(vreq));
|
||||
field.setAssertions(assertions);
|
||||
|
||||
fields.put(field.getName(), field);
|
||||
|
||||
}
|
||||
|
|
@ -534,8 +518,7 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
|
|||
String fieldName = "existingGrantLabel";
|
||||
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName(fieldName);
|
||||
field.setNewResource(false);
|
||||
field.setName(fieldName);
|
||||
//queryForExisting is not being used anywhere in Field
|
||||
|
||||
//Not really interested in validators here
|
||||
|
|
@ -551,9 +534,6 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
|
|||
field.setRangeDatatypeUri(null);
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
field.setAssertions(assertions);
|
||||
fields.put(field.getName(), field);
|
||||
}
|
||||
|
||||
|
|
@ -562,8 +542,7 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
|
|||
String fieldName = "startField";
|
||||
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName(fieldName);
|
||||
field.setNewResource(false);
|
||||
field.setName(fieldName);
|
||||
|
||||
List<String> validators = new ArrayList<String>();
|
||||
field.setValidators(validators);
|
||||
|
|
@ -576,12 +555,7 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
|
|||
field.setObjectClassUri(null);
|
||||
field.setRangeDatatypeUri(null);
|
||||
//empty
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
assertions.addAll(getN3ForStart());
|
||||
field.setAssertions(assertions);
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//This logic was originally after edit configuration object created from json in original jsp
|
||||
field.setEditElement(
|
||||
|
|
@ -598,8 +572,7 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
|
|||
String fieldName = "endField";
|
||||
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName(fieldName);
|
||||
field.setNewResource(false);
|
||||
field.setName(fieldName);
|
||||
|
||||
List<String> validators = new ArrayList<String>();
|
||||
field.setValidators(validators);
|
||||
|
|
@ -614,10 +587,6 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
|
|||
//empty
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
assertions.addAll(getN3ForEnd());
|
||||
field.setAssertions(assertions);
|
||||
//Set edit element
|
||||
field.setEditElement(
|
||||
new DateTimeWithPrecisionVTwo(field,
|
||||
|
|
|
|||
|
|
@ -100,9 +100,7 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
|
||||
@Override
|
||||
public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
|
||||
EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
|
||||
//Set n3 generator
|
||||
editConfiguration.setN3Generator(new EditN3GeneratorVTwo(editConfiguration));
|
||||
EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
|
||||
|
||||
//process subject, predicate, object parameters
|
||||
this.initProcessParameters(vreq, session, editConfiguration);
|
||||
|
|
@ -203,9 +201,6 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
//this needs to be set for the editing to be triggered properly, otherwise the 'prepare' method
|
||||
//pretends this is a data property editing statement and throws an error
|
||||
//TODO: Check if null in case no object uri exists but this is still an object property
|
||||
if(objectUri != null) {
|
||||
editConfiguration.setObjectResource(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -229,9 +224,8 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
editString += "?roleActivity " + getActivityToRolePredicate(vreq) + " ?role .";
|
||||
n3ForEdit.add(editString);
|
||||
return n3ForEdit;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private List<String> generateN3Optional() {
|
||||
List<String> n3Optional = new ArrayList<String>();
|
||||
//n3 for activity label
|
||||
|
|
@ -680,8 +674,7 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
String stringDatatypeUri = XSD.xstring.toString();
|
||||
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName(fieldName);
|
||||
field.setNewResource(false);
|
||||
field.setName(fieldName);
|
||||
//queryForExisting is not being used anywhere in Field
|
||||
|
||||
//Not really interested in validators here
|
||||
|
|
@ -698,10 +691,7 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
assertions.add("?roleActivity ?activityToRolePredicate ?role .");
|
||||
field.setAssertions(assertions);
|
||||
|
||||
fields.put(field.getName(), field);
|
||||
|
||||
}
|
||||
|
|
@ -716,8 +706,7 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
String stringDatatypeUri = XSD.xstring.toString();
|
||||
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName(fieldName);
|
||||
field.setNewResource(false);
|
||||
field.setName(fieldName);
|
||||
//queryForExisting is not being used anywhere in Field
|
||||
|
||||
//Not really interested in validators here
|
||||
|
|
@ -734,10 +723,7 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
assertions.add("?role ?roleToActivityPredicate ?roleActivity .");
|
||||
field.setAssertions(assertions);
|
||||
|
||||
fields.put(field.getName(), field);
|
||||
|
||||
}
|
||||
|
|
@ -752,10 +738,8 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
String stringDatatypeUri = XSD.xstring.toString();
|
||||
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName(fieldName);
|
||||
field.setNewResource(false);
|
||||
//queryForExisting is not being used anywhere in Field
|
||||
|
||||
field.setName(fieldName);
|
||||
//queryForExisting is not being used anywhere in Field
|
||||
|
||||
List<String> validators = new ArrayList<String>();
|
||||
//If add mode or repair, etc. need to add label required validator
|
||||
|
|
@ -776,10 +760,7 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
assertions.add(getN3ForActivityLabel());
|
||||
field.setAssertions(assertions);
|
||||
|
||||
fields.put(field.getName(), field);
|
||||
}
|
||||
|
||||
|
|
@ -791,10 +772,7 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
//get range data type uri and range language
|
||||
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName(fieldName);
|
||||
field.setNewResource(true);
|
||||
//queryForExisting is not being used anywhere in Field
|
||||
|
||||
field.setName(fieldName);
|
||||
|
||||
List<String> validators = new ArrayList<String>();
|
||||
if(isAddMode(vreq) || isRepairMode(vreq)) {
|
||||
|
|
@ -822,10 +800,6 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
}
|
||||
field.setLiteralOptions(fieldLiteralOptions);
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
assertions.add(getN3ForActivityType());
|
||||
field.setAssertions(assertions);
|
||||
fields.put(field.getName(), field);
|
||||
|
||||
}
|
||||
|
|
@ -837,8 +811,7 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
//get range data type uri and range language
|
||||
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName(fieldName);
|
||||
field.setNewResource(true);
|
||||
field.setName(fieldName);
|
||||
|
||||
List<String> validators = new ArrayList<String>();
|
||||
field.setValidators(validators);
|
||||
|
|
@ -853,14 +826,6 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
//empty
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
//N3ForRoleToActivity
|
||||
String n3ForRoleToActivity = "@prefix core: <" + getVivoCoreNamespace() + "> ." +
|
||||
"?role " + getRoleToActivityPredicate(vreq) + " ?roleActivity ." +
|
||||
"?roleActivity " + getActivityToRolePredicate(vreq) + " ?role .";
|
||||
assertions.add(n3ForRoleToActivity);
|
||||
field.setAssertions(assertions);
|
||||
fields.put(field.getName(), field);
|
||||
|
||||
}
|
||||
|
|
@ -870,10 +835,8 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
String fieldName = "roleLabel";
|
||||
String stringDatatypeUri = XSD.xstring.toString();
|
||||
|
||||
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName(fieldName);
|
||||
field.setNewResource(false);
|
||||
field.setName(fieldName);
|
||||
|
||||
List<String> validators = new ArrayList<String>();
|
||||
validators.add("datatype:" + stringDatatypeUri);
|
||||
|
|
@ -891,11 +854,7 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
field.setRangeDatatypeUri(stringDatatypeUri);
|
||||
//empty
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
assertions.add(getN3RoleLabelAssertion());
|
||||
field.setAssertions(assertions);
|
||||
|
||||
fields.put(field.getName(), field);
|
||||
|
||||
}
|
||||
|
|
@ -907,8 +866,7 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
String fieldName = "startField";
|
||||
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName(fieldName);
|
||||
field.setNewResource(false);
|
||||
field.setName(fieldName);
|
||||
|
||||
List<String> validators = new ArrayList<String>();
|
||||
field.setValidators(validators);
|
||||
|
|
@ -922,12 +880,7 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
field.setRangeDatatypeUri(null);
|
||||
//empty
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
assertions.addAll(getN3ForStart());
|
||||
field.setAssertions(assertions);
|
||||
|
||||
|
||||
//This logic was originally after edit configuration object created from json in original jsp
|
||||
field.setEditElement(
|
||||
new DateTimeWithPrecisionVTwo(field,
|
||||
|
|
@ -943,8 +896,7 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
String fieldName = "endField";
|
||||
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName(fieldName);
|
||||
field.setNewResource(false);
|
||||
field.setName(fieldName);
|
||||
|
||||
List<String> validators = new ArrayList<String>();
|
||||
field.setValidators(validators);
|
||||
|
|
@ -959,10 +911,6 @@ public abstract class AddRoleToPersonTwoStageGenerator implements EditConfigurat
|
|||
//empty
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
assertions.addAll(getN3ForEnd());
|
||||
field.setAssertions(assertions);
|
||||
//Set edit element
|
||||
field.setEditElement(
|
||||
new DateTimeWithPrecisionVTwo(field,
|
||||
|
|
|
|||
|
|
@ -67,8 +67,6 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
|
|||
@Override
|
||||
public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
|
||||
EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
|
||||
//Set n3 generator
|
||||
editConfiguration.setN3Generator(new EditN3GeneratorVTwo(editConfiguration));
|
||||
|
||||
//process subject, predicate, object parameters
|
||||
this.initProcessParameters(vreq, session, editConfiguration);
|
||||
|
|
@ -187,13 +185,11 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
|
|||
//this needs to be set for the editing to be triggered properly, otherwise the 'prepare' method
|
||||
//pretends this is a data property editing statement and throws an error
|
||||
//TODO: Check if null in case no object uri exists but this is still an object property
|
||||
if(objectUri != null) {
|
||||
editConfiguration.setObjectResource(true);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void processDataPropForm(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
|
||||
editConfiguration.setObjectResource(false);
|
||||
|
||||
//set data prop value, data prop key str,
|
||||
editConfiguration.setDatapropKey((datapropKeyStr==null)?"":datapropKeyStr);
|
||||
editConfiguration.setVarNameForObject(dataLiteral);
|
||||
|
|
@ -297,8 +293,7 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
|
|||
private void getLastNameField(EditConfigurationVTwo editConfiguration,
|
||||
VitroRequest vreq, Map<String, FieldVTwo> fields) {
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName("lastName");
|
||||
field.setNewResource(false);
|
||||
field.setName("lastName");
|
||||
//queryForExisting is not being used anywhere in Field
|
||||
String stringDatatypeUri = XSD.xstring.toString();
|
||||
|
||||
|
|
@ -319,9 +314,6 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
|
|||
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
field.setAssertions(assertions);
|
||||
fields.put(field.getName(), field);
|
||||
|
||||
}
|
||||
|
|
@ -329,8 +321,7 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
|
|||
private void getFirstNameField(EditConfigurationVTwo editConfiguration,
|
||||
VitroRequest vreq, Map<String, FieldVTwo> fields) {
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName("firstName");
|
||||
field.setNewResource(false);
|
||||
field.setName("firstName");
|
||||
//queryForExisting is not being used anywhere in Field
|
||||
String stringDatatypeUri = XSD.xstring.toString();
|
||||
|
||||
|
|
@ -351,9 +342,6 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
|
|||
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
field.setAssertions(assertions);
|
||||
fields.put(field.getName(), field);
|
||||
|
||||
|
||||
|
|
@ -362,8 +350,7 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
|
|||
private void getLabelField(EditConfigurationVTwo editConfiguration,
|
||||
VitroRequest vreq, Map<String, FieldVTwo> fields) {
|
||||
FieldVTwo field = new FieldVTwo();
|
||||
field.setName("label");
|
||||
field.setNewResource(false);
|
||||
field.setName("label");
|
||||
//queryForExisting is not being used anywhere in Field
|
||||
String stringDatatypeUri = XSD.xstring.toString();
|
||||
|
||||
|
|
@ -384,9 +371,6 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
|
|||
|
||||
field.setLiteralOptions(new ArrayList<List<String>>());
|
||||
|
||||
//set assertions
|
||||
List<String> assertions = new ArrayList<String>();
|
||||
field.setAssertions(assertions);
|
||||
fields.put(field.getName(), field);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import java.util.Arrays;
|
|||
|
||||
import javax.servlet.http.HttpSession;
|
||||
|
||||
import com.hp.hpl.jena.rdf.model.Model;
|
||||
import com.hp.hpl.jena.vocabulary.XSD;
|
||||
|
||||
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
|
||||
|
|
@ -113,57 +114,48 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
|
|||
conf.addField( new FieldVTwo().
|
||||
setName("degree").
|
||||
setOptionsType( FieldVTwo.OptionsType.INDIVIDUALS_VIA_VCLASS ).
|
||||
setObjectClassUri( degreeClass ).
|
||||
setAssertions( degreeAssertion ));
|
||||
setObjectClassUri( degreeClass ));
|
||||
|
||||
conf.addField( new FieldVTwo().
|
||||
setName("majorField").
|
||||
setRangeDatatypeUri( XSD.xstring.toString() ).
|
||||
setAssertions( majorFieldAssertion ));
|
||||
setRangeDatatypeUri( XSD.xstring.toString() ));
|
||||
//setValidators( ) datatype:stringDatatypeUriJson
|
||||
|
||||
conf.addField( new FieldVTwo().
|
||||
setName("org").
|
||||
setOptionsType(FieldVTwo.OptionsType.INDIVIDUALS_VIA_VCLASS).
|
||||
setObjectClassUri( orgClass ).
|
||||
setAssertions( n3ForEdTrainingToOrg ));
|
||||
setObjectClassUri( orgClass ));
|
||||
//setLiteralOptions( [ "Select One" } )
|
||||
|
||||
conf.addField( new FieldVTwo().
|
||||
setName("orgLabel").
|
||||
setRangeDatatypeUri(XSD.xstring.toString() ).
|
||||
setAssertions( orgLabelAssertion));
|
||||
setRangeDatatypeUri(XSD.xstring.toString() ));
|
||||
//setValidators( ["nonempty"] )
|
||||
|
||||
conf.addField( new FieldVTwo().
|
||||
setName("orgType").
|
||||
setOptionsType(FieldVTwo.OptionsType.CHILD_VCLASSES).
|
||||
setObjectClassUri( orgClass ).
|
||||
setAssertions( orgTypeAssertion ));
|
||||
setObjectClassUri( orgClass ));
|
||||
//setValidators( ["nonempty"])
|
||||
//setLiteralOptions( [ "Select one" ] )
|
||||
|
||||
conf.addField( new FieldVTwo().
|
||||
setName("dept").
|
||||
setRangeDatatypeUri( XSD.xstring.toString() ).
|
||||
setAssertions( deptAssertion ));
|
||||
setRangeDatatypeUri( XSD.xstring.toString() ));
|
||||
|
||||
conf.addField( new FieldVTwo().
|
||||
setName("info").
|
||||
setRangeDatatypeUri( XSD.xstring.toString() ).
|
||||
setAssertions( infoAssertion));
|
||||
setRangeDatatypeUri( XSD.xstring.toString() ));
|
||||
|
||||
conf.addField(new FieldVTwo().
|
||||
setName("startField").
|
||||
setAssertions(n3ForStart).
|
||||
setName("startField").
|
||||
setEditElement(
|
||||
new DateTimeWithPrecisionVTwo(null,
|
||||
VitroVocabulary.Precision.YEAR.uri(),
|
||||
VitroVocabulary.Precision.NONE.uri())));
|
||||
|
||||
conf.addField( new FieldVTwo().
|
||||
setName("endField").
|
||||
setAssertions(n3ForEnd).
|
||||
setName("endField").
|
||||
setEditElement(
|
||||
new DateTimeWithPrecisionVTwo(null,
|
||||
VitroVocabulary.Precision.YEAR.uri(),
|
||||
|
|
@ -230,7 +222,7 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
|
|||
final static String orgLabelQuery =
|
||||
"SELECT ?existingOrgLabel WHERE {\n"+
|
||||
"?edTraining <"+ trainingAtOrg +"> ?existingOrg .\n"+
|
||||
"?existingOrg "+ label +" ?existingOrgLabel .\n"+
|
||||
"?existingOrg <"+ label +"> ?existingOrgLabel .\n"+
|
||||
"}";
|
||||
|
||||
/* Limit type to subclasses of foaf:Organization. Otherwise, sometimes owl:Thing or another
|
||||
|
|
@ -240,12 +232,12 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
|
|||
"SELECT ?existingOrgType WHERE {\n"+
|
||||
"?edTraining <"+ trainingAtOrg +"> ?existingOrg .\n"+
|
||||
"?existingOrg a ?existingOrgType .\n"+
|
||||
"?existingOrgType rdfs:subClassOf "+ orgClass +" .\n"+
|
||||
"?existingOrgType rdfs:subClassOf <"+ orgClass +"> .\n"+
|
||||
"}";
|
||||
|
||||
final static String degreeQuery =
|
||||
"SELECT ?existingDegree WHERE {\n"+
|
||||
"?edTraining "+ degreeEarned +" ?existingDegree . }";
|
||||
"?edTraining <"+ degreeEarned +"> ?existingDegree . }";
|
||||
|
||||
final static String majorFieldQuery =
|
||||
"SELECT ?existingMajorField WHERE {\n"+
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue