From c162d3d84bb14fad39f925cc49fd125c05d97e0a Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Tue, 6 Aug 2013 16:55:15 -0400 Subject: [PATCH] position form updates for ISF --- .../ontologies/app/loadedAtStartup/PropertyConfig.n3 | 3 ++- .../generators/PersonHasPositionHistoryGenerator.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/productMods/WEB-INF/ontologies/app/loadedAtStartup/PropertyConfig.n3 b/productMods/WEB-INF/ontologies/app/loadedAtStartup/PropertyConfig.n3 index fde85126..5dc1150d 100644 --- a/productMods/WEB-INF/ontologies/app/loadedAtStartup/PropertyConfig.n3 +++ b/productMods/WEB-INF/ontologies/app/loadedAtStartup/PropertyConfig.n3 @@ -24,7 +24,8 @@ local:personInPositionConfig a :ObjectPropertyDisplayConfig ; :displayName "positions" ; :listViewConfigFile "listViewConfig-personInPosition.xml"^^xsd:string ; :propertyGroup ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public . + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasPositionHistoryGenerator"^^xsd:string . local:authorInAuthorshipContext a :ConfigContext ; :hasConfiguration local:authorInAuthorshipConfig ; diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java index 900b8657..be571723 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java @@ -30,8 +30,8 @@ public class PersonHasPositionHistoryGenerator extends VivoBaseGenerator impleme final static String positionClass = vivoCore + "Position"; final static String orgClass = "http://xmlns.com/foaf/0.1/Organization"; - final static String positionInOrgPred = vivoCore + "positionInOrganization"; - final static String orgForPositionPred = vivoCore + "organizationForPosition"; + final static String positionInOrgPred = vivoCore + "relates"; + final static String orgForPositionPred = vivoCore + "relatedBy"; final static String positionToInterval = vivoCore + "dateTimeInterval"; final static String intervalType = vivoCore + "DateTimeInterval"; final static String intervalToStart = vivoCore + "start"; @@ -166,9 +166,9 @@ public class PersonHasPositionHistoryGenerator extends VivoBaseGenerator impleme final static String n3ForNewPosition = "@prefix core: <" + vivoCore + "> . \n" + - "?person core:personInPosition ?position . \n" + + "?person core:relatedBy ?position . \n" + "?position a ?positionType . \n" + - "?position core:positionForPerson ?person ; "; + "?position core:relates ?person ; "; final static String positionTitleAssertion = "?position <" + label + "> ?positionTitle .";