diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index 3acff04c..49bdfced 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -677,7 +677,7 @@ local:eventWithinContext a :ConfigContext ; local:eventWithinConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "event within" ; + :displayName "occurs within (parent event)" ; vitro:displayRankAnnot 1; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java index b4f6c604..1d8abae7 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationForTrainingGenerator.java @@ -41,7 +41,7 @@ public class OrganizationForTrainingGenerator extends VivoBaseGenerator impleme conf.setVarNameForObject("edTraining"); conf.setN3Required( Arrays.asList( n3ForNewEdTraining, trainingTypeAssertion ) ); - conf.setN3Optional(Arrays.asList( majorFieldAssertion, n3ForAwardedDegree, n3ForNewPersonanization, n3ForExistingPersonanization, + conf.setN3Optional(Arrays.asList( majorFieldAssertion, n3ForAwardedDegree, n3ForNewPerson, n3ForExistingPerson, n3ForNewPersonAwardedDegree, n3ForExistingPersonAwardedDegree, deptAssertion, infoAssertion, n3ForStart, n3ForEnd )); conf.addNewResource("edTraining", DEFAULT_NS_FOR_NEW_RESOURCE); @@ -195,13 +195,13 @@ public class OrganizationForTrainingGenerator extends VivoBaseGenerator impleme "?degreeType ?awardedDegree . \n"+ "?awardedDegree a core:AwardedDegree ."; - final static String n3ForNewPersonanization = + final static String n3ForNewPerson = "?edTraining ?newPerson . \n" + "?newPerson ?edTraining . \n" + "?newPerson a . \n" + "?newPerson <"+ label +"> ?personLabel . "; - final static String n3ForExistingPersonanization = + final static String n3ForExistingPerson = "?edTraining ?existingPerson . \n" + "?existingPerson ?edTraining . \n" + "?existingPerson a ?personType . ";