diff --git a/productMods/WEB-INF/ontologies/update/diff.tab.txt b/productMods/WEB-INF/ontologies/update/diff.tab.txt index 06c82227..0e503b81 100644 --- a/productMods/WEB-INF/ontologies/update/diff.tab.txt +++ b/productMods/WEB-INF/ontologies/update/diff.tab.txt @@ -82,33 +82,32 @@ http://vivoweb.org/ontology/core#courseTaughtBy No Delete not set http://vivoweb.org/ontology/core#recentCourseTaught No Delete not set http://vivoweb.org/ontology/core#investigatorOn No Delete not set http://vivoweb.org/ontology/core#hasInvestigator No Delete not set -http://vivoweb.org/ontology/core#PresentationActivity No Delete not set -http://vivoweb.org/ontology/core#presentationActivity No Delete not set -http://vivoweb.org/ontology/core#presentationActivityBy No Delete not set -http://vivoweb.org/ontology/core#ResearchActivity No Delete not set -http://vivoweb.org/ontology/core#researchActivityBy No Delete not set -http://vivoweb.org/ontology/core#hasResearchActivity No Delete not set -http://vivoweb.org/ontology/core#InternationalActivity No Delete not set http://vivoweb.org/ontology/core#contributingParticipantIn No Delete not set http://vivoweb.org/ontology/core#hasContributingParticipant No Delete not set http://vivoweb.org/ontology/core#organizationRelatedActivity No Delete not set http://vivoweb.org/ontology/core#activityRelatedOrganization No Delete not set -http://vivoweb.org/ontology/core#hasOutreachActivity No Delete not set -http://vivoweb.org/ontology/core#hasProfessionalServiceActivity No Delete not set http://vivoweb.org/ontology/core#activityRelatedInformationResource No Delete not set http://vivoweb.org/ontology/core#informationResourceRelatedActivity No Delete not set http://vivoweb.org/ontology/core#activityRelatedGrant No Delete not set http://vivoweb.org/ontology/core#grantRelatedActivity No Delete not set http://vivoweb.org/ontology/core#activityRelatedEvent No Delete not set http://vivoweb.org/ontology/core#eventRelatedActivity No Delete not set +http://vivoweb.org/ontology/core#PresentationActivity No Delete not set +http://vivoweb.org/ontology/core#presentationActivity No Delete not set +http://vivoweb.org/ontology/core#presentationActivityBy No Delete not set +http://vivoweb.org/ontology/core#InternationalActivity No Delete not set http://vivoweb.org/ontology/core#Activity http://vivoweb.org/ontology/core#Role Yes Map Directly-changed http://vivoweb.org/ontology/core#activityBy http://vivoweb.org/ontology/core#roleOf Yes Map Directly-changed http://vivoweb.org/ontology/core#hasActivity http://vivoweb.org/ontology/core#hasRole Yes Map Directly-changed -http://vivoweb.org/ontology/core#PostDoc http://vivoweb.org/ontology/core#Postdoc Yes Map Directly-changed -http://vivoweb.org/ontology/core#ServiceActivity http://vivoweb.org/ontology/core#ServiceProviderRole Yes Map Directly-changed -http://vivoweb.org/ontology/core#professionalServiceActivityBy http://vivoweb.org/ontology/core#serviceProviderRoleOf Yes Map Directly-changed +http://vivoweb.org/ontology/core#ResearchActivity http://vivoweb.org/ontology/core#ResearcherRole Yes Map Directly-changed +http://vivoweb.org/ontology/core#researchActivityBy http://vivoweb.org/ontology/core#researcherRoleOf Yes Map Directly-changed +http://vivoweb.org/ontology/core#hasResearchActivity http://vivoweb.org/ontology/core#hasResearcherRole Yes Map Directly-changed http://vivoweb.org/ontology/core#OutreachActivity http://vivoweb.org/ontology/core#OutreachProviderRole Yes Map Directly-changed http://vivoweb.org/ontology/core#outreachActivityBy http://vivoweb.org/ontology/core#outreachProviderRoleOf Yes Map Directly-changed +http://vivoweb.org/ontology/core#hasOutreachActivity http://vivoweb.org/ontology/core#hasOutreachProviderRole Yes Map Directly-changed +http://vivoweb.org/ontology/core#ServiceActivity http://vivoweb.org/ontology/core#ServiceProviderRole Yes Map Directly-changed +http://vivoweb.org/ontology/core#professionalServiceActivityBy http://vivoweb.org/ontology/core#serviceProviderRoleOf Yes Map Directly-changed +http://vivoweb.org/ontology/core#hasProfessionalServiceActivity http://vivoweb.org/ontology/core#hasServiceProviderRole Yes Map Directly-changed http://vivoweb.org/ontology/core#TeachingActivity http://vivoweb.org/ontology/core#TeacherRole Yes Map Directly-changed http://vivoweb.org/ontology/core#teachingActivityBy http://vivoweb.org/ontology/core#teacherRoleOf Yes Map Directly-changed http://vivoweb.org/ontology/core#hasTeachingActivity http://vivoweb.org/ontology/core#hasTeacherRole Yes Map Directly-changed @@ -117,6 +116,7 @@ http://vivoweb.org/ontology/core#AdvisingActivity http://vivoweb.org/ontology/co http://vivoweb.org/ontology/core#hasAdvisingActivity http://vivoweb.org/ontology/core#advisorIn Yes Map Directly-changed http://vivoweb.org/ontology/core#advisingActivityBy http://vivoweb.org/ontology/core#advisor Yes Map Directly-changed http://vivoweb.org/ontology/core#advisedBy http://vivoweb.org/ontology/core#adviseeIn Yes Map Directly-changed +http://vivoweb.org/ontology/core#PostDoc http://vivoweb.org/ontology/core#Postdoc Yes Map Directly-changed http://vivoweb.org/ontology/core#ReserachProposal http://vivoweb.org/ontology/core#ResearchProposal Yes Map Directly-changed http://vivoweb.org/ontology/core#Talk http://vivoweb.org/ontology/core#Presentation Yes Map Directly-changed http://vivoweb.org/ontology/core#degreeAbbreviation http://vivoweb.org/ontology/core#abbreviation Yes Map Directly-changed diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/OutreachProviderRole.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/OutreachProviderRole.sparql index 6101366c..5d0aa93c 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/OutreachProviderRole.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/OutreachProviderRole.sparql @@ -14,11 +14,8 @@ PREFIX skos: PREFIX core: Construct { - _:role a core:OutreachProviderRole . - ?person core:hasOutreachProviderRole _:role . - _:role core:outreachProviderRoleOf ?person . - _:role core:roleIn ?grant . - ?grant core:relatedRole _:role . + _:activity core:roleIn ?grant . + ?grant core:relatedRole ?activity . } where { ?person core:hasOutreachActivity ?activity . diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/PresenterRole.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/PresenterRole.sparql index 45316d87..80ee89cf 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/PresenterRole.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/PresenterRole.sparql @@ -22,13 +22,13 @@ Construct { ?event bibo:presents ?infores . ?infores bibo:presentedAt ?event. } where { - ?person core:presentationActivity ?pactivity . + ?person core:presentationActivity ?activity . optional { - ?pactivity core:activityRelatedEvent ?event . + ?activity core:activityRelatedEvent ?event . } optional { - ?pactivity core:activityRelatedInformationResource ?infores . + ?activity core:activityRelatedInformationResource ?infores . } } \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/ResearcherRole.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/ResearcherRole.sparql index 1297fa10..865ff886 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/ResearcherRole.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/ResearcherRole.sparql @@ -14,11 +14,8 @@ PREFIX skos: PREFIX core: Construct { - _:role a core:ResearcherRole . - ?person core:hasResearcherRole _:role . - _:role core:researcherRoleOf ?person . - _:role core:roleIn ?grant . - ?grant core:relatedRole _:role . + ?activity core:roleIn ?grant . + ?grant core:relatedRole ?activity . } where { ?person core:hasResearchActivity ?activity . diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/ServiceProviderRole.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/ServiceProviderRole.sparql index 2086f2e8..d685235a 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/ServiceProviderRole.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/ServiceProviderRole.sparql @@ -14,11 +14,8 @@ PREFIX skos: PREFIX core: Construct { - _:role a core:ServiceProviderRole . - ?person core:hasServiceProviderRole _:role . - _:role core:serviceProviderRoleOf ?person . - _:role core:roleIn ?grant . - ?grant core:relatedRole _:role . + ?activity core:roleIn ?grant . + ?grant core:relatedRole ?activity . } where { ?person core:hasProfessionalServiceActivity ?activity .