diff --git a/productMods/WEB-INF/filegraph/abox/us-states.rdf b/productMods/WEB-INF/filegraph/abox/us-states.rdf
index 01252b0d..eacb0984 100644
--- a/productMods/WEB-INF/filegraph/abox/us-states.rdf
+++ b/productMods/WEB-INF/filegraph/abox/us-states.rdf
@@ -1,206 +1,309 @@
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" >
Alabama
+
Alaska
+
Arizona
+
Arkansas
+
California
+
Colorado
+
Connecticut
+
Delaware
+
Florida
+
Georgia
+
Hawaii
+
Idaho
+
Illinois
+
Indiana
+
Iowa
+
Kansas
+
Kentucky
+
Louisiana
+
Maine
+
Maryland
+
Massachusetts
+
Michigan
+
Minnesota
+
Mississipi
+
Missouri
+
Montana
+
Nebraska
+
Nevada
+
New Hampshire
+
New Jersey
+
New Mexico
+
New York
+
North Carolina
+
North Dakota
+
Ohio
+
Oklahoma
+
Oregon
+
Pennsylvania
+
Rhode Island
+
South Carolina
+
South Dakota
+
Tennessee
+
Texas
+
Utah
+
Vermont
+
Virginia
+
Washington
+
West Virginia
+
Wisconsin
+
Wyoming
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/productMods/WEB-INF/ontologies/app/loadedAtStartup/PropertyConfig.n3 b/productMods/WEB-INF/ontologies/app/loadedAtStartup/PropertyConfig.n3
index 1a99c7fc..42625bb4 100644
--- a/productMods/WEB-INF/ontologies/app/loadedAtStartup/PropertyConfig.n3
+++ b/productMods/WEB-INF/ontologies/app/loadedAtStartup/PropertyConfig.n3
@@ -18,6 +18,7 @@
local:personInPositionContext a :ConfigContext ;
:hasConfiguration local:personInPositionConfig ;
:configContextFor vivo:relatedBy ;
+ :qualifiedByDomain ;
:qualifiedBy vivo:Position .
local:personInPositionConfig a :ObjectPropertyDisplayConfig ;
@@ -27,6 +28,19 @@ local:personInPositionConfig a :ObjectPropertyDisplayConfig ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasPositionHistoryGenerator"^^xsd:string .
+local:organizationForPositionContext a :ConfigContext ;
+ :hasConfiguration local:organizationForPositionConfig ;
+ :configContextFor vivo:relatedBy ;
+ :qualifiedByDomain ;
+ :qualifiedBy vivo:Position .
+
+local:organizationForPositionConfig a :ObjectPropertyDisplayConfig ;
+ :displayName "people" ;
+ :listViewConfigFile "listViewConfig-organizationForPosition.xml"^^xsd:string ;
+ :propertyGroup ;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationHasPositionHistoryGenerator"^^xsd:string .
+
local:authorInAuthorshipContext a :ConfigContext ;
:hasConfiguration local:authorInAuthorshipConfig ;
:configContextFor vivo:relatedBy ;
@@ -38,19 +52,147 @@ local:authorInAuthorshipConfig a :ObjectPropertyDisplayConfig ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPublicationToPersonGenerator"^^xsd:string ;
- :propertyGroup .
+ :propertyGroup .
- a :ConfigContext ;
- :hasConfiguration ;
+local:hasServiceProviderRoleContext a :ConfigContext ;
+ :hasConfiguration local:hasServiceProviderRoleConfig ;
:configContextFor ;
:qualifiedBy .
-
- a :ObjectPropertyDisplayConfig ;
+local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
- :displayName "has service provider role" ;
+ :displayName "service to the profession" ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddServiceProviderRoleToPersonGenerator"^^ ;
- :propertyGroup .
+ :propertyGroup .
+local:hasClinicalRoleContext a :ConfigContext ;
+ :hasConfiguration local:hasClinicalRoleConfig ;
+ :configContextFor ;
+ :qualifiedBy .
+
+local:hasClinicalRoleConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
+ :displayName "clinical activities" ;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddClinicalRoleToPersonGenerator"^^ ;
+ :propertyGroup .
+
+local:hasLeaderRoleContext a :ConfigContext ;
+ :hasConfiguration local:hasLeaderRoleConfig ;
+ :configContextFor ;
+ :qualifiedBy .
+
+local:hasLeaderRoleConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
+ :displayName "head of" ;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddHeadOfRoleToPersonGenerator"^^ ;
+ :propertyGroup .
+
+local:hasMemberRoleContext a :ConfigContext ;
+ :hasConfiguration local:hasMemberRoleConfig ;
+ :configContextFor ;
+ :qualifiedBy .
+
+local:hasMemberRoleConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
+ :displayName "member of" ;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddMemberRoleToPersonGenerator"^^ ;
+ :propertyGroup .
+
+local:hasTeacherRoleContext a :ConfigContext ;
+ :hasConfiguration local:hasTeacherRoleConfig ;
+ :configContextFor ;
+ :qualifiedBy .
+
+local:hasTeacherRoleConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
+ :displayName "teaching activities" ;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddTeacherRoleToPersonGenerator"^^ ;
+ :propertyGroup .
+
+local:hasEditorRoleContext a :ConfigContext ;
+ :hasConfiguration local:hasEditorRoleConfig ;
+ :configContextFor ;
+ :qualifiedBy .
+
+local:hasEditorRoleConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
+ :displayName "collection or series editor for" ;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddEditorRoleToPersonGenerator"^^ ;
+ :propertyGroup .
+
+local:hasReviewerRoleContext a :ConfigContext ;
+ :hasConfiguration local:hasReviewerRoleConfig ;
+ :configContextFor ;
+ :qualifiedBy .
+
+local:hasReviewerRoleConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
+ :displayName "reviewer of" ;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddReviewerRoleToPersonGenerator"^^ ;
+ :propertyGroup .
+
+local:hasOrganizerRoleContext a :ConfigContext ;
+ :hasConfiguration local:hasOrganizerRoleConfig ;
+ :configContextFor ;
+ :qualifiedBy .
+
+local:hasOrganizerRoleConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
+ :displayName "organizer of" ;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOrganizerRoleToPersonGenerator"^^ ;
+ :propertyGroup .
+
+local:hasOutreachProviderRoleContext a :ConfigContext ;
+ :hasConfiguration local:hasOutreachProviderRoleConfig ;
+ :configContextFor ;
+ :qualifiedBy .
+
+local:hasOutreachProviderRoleConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
+ :displayName "outreach and community service" ;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOutreachProviderRoleToPersonGenerator"^^ ;
+ :propertyGroup .
+
+local:hasAttendeeRoleContext a :ConfigContext ;
+ :hasConfiguration local:hasAttendeeRoleConfig ;
+ :configContextFor ;
+ :qualifiedBy .
+
+local:hasAttendeeRoleConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
+ :displayName "attended" ;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAttendeeRoleToPersonGenerator"^^ ;
+ :propertyGroup .
+
+local:hasResearcherRoleContext a :ConfigContext ;
+ :hasConfiguration local:hasResearcherRoleConfig ;
+ :configContextFor ;
+ :qualifiedBy .
+
+local:hasResearcherRoleConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
+ :displayName "research activities" ;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddResearcherRoleToPersonGenerator"^^ ;
+ :propertyGroup .
diff --git a/productMods/config/listViewConfig-organizationForPosition.xml b/productMods/config/listViewConfig-organizationForPosition.xml
index ec122fe2..9416110d 100644
--- a/productMods/config/listViewConfig-organizationForPosition.xml
+++ b/productMods/config/listViewConfig-organizationForPosition.xml
@@ -1,116 +1,113 @@
-
-
-
-
-
-
-
- PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
- PREFIX core: <http://vivoweb.org/ontology/core#>
- PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
- PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
-
- SELECT DISTINCT ?subclass
- ?position
- ?positionTitle
- ?person ?personName
- ?dateTimeStart ?dateTimeEnd
- ?hideThis
- WHERE {
- ?subject ?property ?position
- OPTIONAL { ?position core:positionForPerson ?person .
- ?person rdfs:label ?personName
- }
-
- OPTIONAL { ?position vitro:mostSpecificType ?subclass .
- ?subclass rdfs:subClassOf core:Position
- }
-
- OPTIONAL { ?position rdfs:label ?positionTitle }
- OPTIONAL { ?position core:hideFromDisplay ?hideThis }
- OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval
- OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
- ?dateTimeStartValue core:dateTime ?dateTimeStart
- }
- OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue .
- ?dateTimeEndValue core:dateTime ?dateTimeEnd
- }
- # Get current positions only: end date is either null or not in the past
- }
- # NOT EXISTS { ?position core:hideFromDisplay ?hideThis }
- FILTER ( !bound(?dateTimeEnd) ||
- afn:substring(str(?dateTimeEnd), 0, 4) >= afn:substring(str(afn:now()), 0, 4) )
-
- FILTER ( bound(?person) )
-
- } ORDER BY ?subclass ?personName
-
-
-
- PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
- PREFIX core: <http://vivoweb.org/ontology/core#>
- PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
- CONSTRUCT {
- ?subject ?property ?position .
- ?position vitro:mostSpecificType ?subclass .
- ?subclass rdfs:subClassOf core:Position
- } WHERE {
- ?subject ?property ?position .
- ?position vitro:mostSpecificType ?subclass .
- ?subclass rdfs:subClassOf core:Position
- }
-
-
-
- PREFIX core: <http://vivoweb.org/ontology/core#>
- PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
- CONSTRUCT {
- ?subject ?property ?position .
- ?position ?positionProperty ?positionValue .
- ?person rdfs:label ?personName
- } WHERE {
- {
- ?subject ?property ?position
- } UNION {
- ?subject ?property ?position .
- ?position ?positionProperty ?positionValue
- } UNION {
- ?subject ?property ?position .
- ?position core:positionForPerson ?person .
- ?person rdfs:label ?personName
- }
- }
-
-
-
- PREFIX core: <http://vivoweb.org/ontology/core#>
- CONSTRUCT {
- ?subject ?property ?position .
- ?position core:dateTimeInterval ?dateTimeInterval .
- ?dateTimeInterval core:start ?dateTimeStartValue .
- ?dateTimeStartValue core:dateTime ?dateTimeStart
- } WHERE {
- ?subject ?property ?position .
- ?position core:dateTimeInterval ?dateTimeInterval .
- ?dateTimeInterval core:start ?dateTimeStartValue .
- ?dateTimeStartValue core:dateTime ?dateTimeStart
- }
-
-
-
- PREFIX core: <http://vivoweb.org/ontology/core#>
- CONSTRUCT {
- ?subject ?property ?position .
- ?position core:dateTimeInterval ?dateTimeInterval .
- ?dateTimeInterval core:end ?dateTimeEndValue .
- ?dateTimeEndValue core:dateTime ?dateTimeEnd
- } WHERE {
- ?subject ?property ?position .
- ?position core:dateTimeInterval ?dateTimeInterval .
- ?dateTimeInterval core:end ?dateTimeEndValue .
- ?dateTimeEndValue core:dateTime ?dateTimeEnd
- }
-
-
- propStatement-organizationForPosition.ftl
-
+
+
+
+
+
+
+
+ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ PREFIX core: <http://vivoweb.org/ontology/core#>
+ PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
+ PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
+
+ SELECT DISTINCT ?subclass
+ ?position
+ ?positionTitle
+ ?person ?personName
+ ?dateTimeStart ?dateTimeEnd
+ ?hideThis
+ WHERE {
+ ?subject ?property ?position
+ OPTIONAL { ?position core:relates ?person .
+ ?person rdfs:label ?personName
+ }
+
+ OPTIONAL { ?position vitro:mostSpecificType ?subclass .
+ }
+
+ OPTIONAL { ?position rdfs:label ?positionTitle }
+ OPTIONAL { ?position core:hideFromDisplay ?hideThis }
+ OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval
+ OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
+ ?dateTimeStartValue core:dateTime ?dateTimeStart
+ }
+ OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue .
+ ?dateTimeEndValue core:dateTime ?dateTimeEnd
+ }
+ # Get current positions only: end date is either null or not in the past
+ }
+ # NOT EXISTS { ?position core:hideFromDisplay ?hideThis }
+ FILTER ( !bound(?dateTimeEnd) ||
+ afn:substring(str(?dateTimeEnd), 0, 4) >= afn:substring(str(afn:now()), 0, 4) )
+
+ FILTER ( bound(?person) )
+
+ } ORDER BY ?subclass ?personName
+
+
+
+ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ PREFIX core: <http://vivoweb.org/ontology/core#>
+ PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
+ CONSTRUCT {
+ ?subject ?property ?position .
+ ?position vitro:mostSpecificType ?subclass
+ } WHERE {
+ ?subject ?property ?position .
+ ?position vitro:mostSpecificType ?subclass
+ }
+
+
+
+ PREFIX core: <http://vivoweb.org/ontology/core#>
+ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ CONSTRUCT {
+ ?subject ?property ?position .
+ ?position ?positionProperty ?positionValue .
+ ?person rdfs:label ?personName
+ } WHERE {
+ {
+ ?subject ?property ?position
+ } UNION {
+ ?subject ?property ?position .
+ ?position ?positionProperty ?positionValue
+ } UNION {
+ ?subject ?property ?position .
+ ?position core:positionForPerson ?person .
+ ?person rdfs:label ?personName
+ }
+ }
+
+
+
+ PREFIX core: <http://vivoweb.org/ontology/core#>
+ CONSTRUCT {
+ ?subject ?property ?position .
+ ?position core:dateTimeInterval ?dateTimeInterval .
+ ?dateTimeInterval core:start ?dateTimeStartValue .
+ ?dateTimeStartValue core:dateTime ?dateTimeStart
+ } WHERE {
+ ?subject ?property ?position .
+ ?position core:dateTimeInterval ?dateTimeInterval .
+ ?dateTimeInterval core:start ?dateTimeStartValue .
+ ?dateTimeStartValue core:dateTime ?dateTimeStart
+ }
+
+
+
+ PREFIX core: <http://vivoweb.org/ontology/core#>
+ CONSTRUCT {
+ ?subject ?property ?position .
+ ?position core:dateTimeInterval ?dateTimeInterval .
+ ?dateTimeInterval core:end ?dateTimeEndValue .
+ ?dateTimeEndValue core:dateTime ?dateTimeEnd
+ } WHERE {
+ ?subject ?property ?position .
+ ?position core:dateTimeInterval ?dateTimeInterval .
+ ?dateTimeInterval core:end ?dateTimeEndValue .
+ ?dateTimeEndValue core:dateTime ?dateTimeEnd
+ }
+
+
+ propStatement-organizationForPosition.ftl
+
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java b/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
index 2404e181..00055c34 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
@@ -36,7 +36,7 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder {
+ "PREFIX core: \n"
+ "PREFIX foaf: \n"
+ "PREFIX vivoc: \n"
- + "SELECT DISTINCT ?label ?location (COUNT(?person) AS ?count) \n"
+ + "SELECT DISTINCT ?label ?location (COUNT(DISTINCT ?person) AS ?count) \n"
+ "WHERE { { \n"
+ " ?location rdf:type core:GeographicRegion . \n"
+ " ?location rdfs:label ?label . \n"
@@ -45,7 +45,7 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder {
+ " FILTER (NOT EXISTS {?location a core:StateOrProvince}) \n"
+ "} UNION { \n"
+ " ?location rdf:type core:GeographicRegion . \n"
- + " ?location core:geographicallyContains ?sublocation . \n"
+ + " ?location ?sublocation . \n"
+ " ?location rdfs:label ?label . \n"
+ " ?sublocation core:geographicFocusOf ?person . \n"
+ " ?person rdf:type foaf:Person \n"
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
index 554fe8cb..b7d61b77 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
@@ -1,50 +1,50 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
-
-public class AddServiceProviderRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
-
- private static String OPTION_CLASS_URI = "http://xmlns.com/foaf/0.1/Organization";
-
- @Override
- String getTemplate() { return "addServiceProviderRoleToPerson.ftl"; }
-
- @Override
- String getRoleType() {
- return "http://vivoweb.org/ontology/core#ServiceProviderRole";
- }
-
- /** Service Provider role involves hard-coded options for the
- * "right side" of the role or activity. */
- @Override
- FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
- return new
- ChildVClassesOptions(OPTION_CLASS_URI)
- .setDefaultOptionLabel("Select type");
- }
-
- @Override
- boolean isShowRoleLabelField(){return true;}
-
- /*
- * Use the methods below to change the date/time precision in the
- * custom form associated with this generator. When not used, the
- * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
- * MINUTE, TIME and NONE.
- */
-/*
- public String getStartDatePrecision() {
- String precision = VitroVocabulary.Precision.MONTH.uri();
- return precision;
- }
-
- public String getEndDatePrecision() {
- String precision = VitroVocabulary.Precision.DAY.uri();
- return precision;
- }
-*/
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
+
+public class AddServiceProviderRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
+
+ private static String OPTION_CLASS_URI = "http://xmlns.com/foaf/0.1/Organization";
+
+ @Override
+ String getTemplate() { return "addServiceProviderRoleToPerson.ftl"; }
+
+ @Override
+ String getRoleType() {
+ return "http://purl.obolibrary.org/obo/ERO_0000012";
+ }
+
+ /** Service Provider role involves hard-coded options for the
+ * "right side" of the role or activity. */
+ @Override
+ FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
+ return new
+ ChildVClassesOptions(OPTION_CLASS_URI)
+ .setDefaultOptionLabel("Select type");
+ }
+
+ @Override
+ boolean isShowRoleLabelField(){return true;}
+
+ /*
+ * Use the methods below to change the date/time precision in the
+ * custom form associated with this generator. When not used, the
+ * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
+ * MINUTE, TIME and NONE.
+ */
+/*
+ public String getStartDatePrecision() {
+ String precision = VitroVocabulary.Precision.MONTH.uri();
+ return precision;
+ }
+
+ public String getEndDatePrecision() {
+ String precision = VitroVocabulary.Precision.DAY.uri();
+ return precision;
+ }
+*/
+}