From 536bfd72bc0f95ef77c4c346643bcaa3fd318ba9 Mon Sep 17 00:00:00 2001 From: sjm222 Date: Thu, 15 Jul 2010 14:52:44 +0000 Subject: [PATCH] moving OutreachActivity and ServiceActivity to mixed SPARQL and tab table strategy --- .../WEB-INF/ontologies/update/diff.tab.txt | 8 ++--- .../CoPrincipalInvestigatorRole.sparql | 2 +- .../sparqlConstructs/InvestigatorRole.sparql | 2 +- .../OutreachProviderRole.sparql | 29 ++++++++++++++++++ .../PrincipalInvestigatorRole.sparql | 2 +- .../sparqlConstructs/ResearcherRole.sparql | 2 +- .../ServiceProviderRole.sparql | 30 +++++++++++++++++++ 7 files changed, 67 insertions(+), 8 deletions(-) create mode 100644 productMods/WEB-INF/ontologies/update/sparqlConstructs/OutreachProviderRole.sparql create mode 100644 productMods/WEB-INF/ontologies/update/sparqlConstructs/ServiceProviderRole.sparql diff --git a/productMods/WEB-INF/ontologies/update/diff.tab.txt b/productMods/WEB-INF/ontologies/update/diff.tab.txt index 4b52b51f..06c82227 100644 --- a/productMods/WEB-INF/ontologies/update/diff.tab.txt +++ b/productMods/WEB-INF/ontologies/update/diff.tab.txt @@ -93,6 +93,8 @@ 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 @@ -103,12 +105,10 @@ http://vivoweb.org/ontology/core#Activity http://vivoweb.org/ontology/core#Role 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#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#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#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 diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/CoPrincipalInvestigatorRole.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/CoPrincipalInvestigatorRole.sparql index 37584ba3..c6877723 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/CoPrincipalInvestigatorRole.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/CoPrincipalInvestigatorRole.sparql @@ -20,5 +20,5 @@ Construct { ?person core:hasCo-PrincipalInvestigatorRole _:role . _:role core:co-PrincipalInvestigatorRoleOf ?person . } where { - ?person core:coPrincipalInvestigatorOn ?grant + ?person core:coPrincipalInvestigatorOn ?grant . } \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/InvestigatorRole.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/InvestigatorRole.sparql index 801c0f89..c59f8d65 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/InvestigatorRole.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/InvestigatorRole.sparql @@ -20,5 +20,5 @@ Construct { ?person core:hasInvestigatorRole _:role . _:role core:investigatorRoleOf ?person . } where { - ?person core:investigatorOn ?grant + ?person core:investigatorOn ?grant . } \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/OutreachProviderRole.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/OutreachProviderRole.sparql new file mode 100644 index 00000000..6101366c --- /dev/null +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/OutreachProviderRole.sparql @@ -0,0 +1,29 @@ +PREFIX rdf: +PREFIX rdfs: +PREFIX xsd: +PREFIX owl: +PREFIX swrl: +PREFIX swrlb: +PREFIX vitro: +PREFIX vivo: +PREFIX bibo: +PREFIX dcterms: +PREFIX event: +PREFIX foaf: +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 . + +} where { + ?person core:hasOutreachActivity ?activity . + + optional { + ?activity core:activityRelatedGrant ?grant . + } +} \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/PrincipalInvestigatorRole.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/PrincipalInvestigatorRole.sparql index e4756825..aa7493f0 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/PrincipalInvestigatorRole.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/PrincipalInvestigatorRole.sparql @@ -20,5 +20,5 @@ Construct { ?person core:hasPrincipalInvestigatorRole _:role . _:role core:principalInvestigatorRoleOf ?person . } where { - ?person core:principalInvestigatorOn ?grant + ?person core:principalInvestigatorOn ?grant . } \ 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 57c222a2..1297fa10 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/ResearcherRole.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/ResearcherRole.sparql @@ -21,7 +21,7 @@ Construct { ?grant core:relatedRole _:role . } where { - ?person core:hasResearchActivity ?activity + ?person core:hasResearchActivity ?activity . optional { ?activity core:activityRelatedGrant ?grant . diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/ServiceProviderRole.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/ServiceProviderRole.sparql new file mode 100644 index 00000000..2086f2e8 --- /dev/null +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/ServiceProviderRole.sparql @@ -0,0 +1,30 @@ +PREFIX rdf: +PREFIX rdfs: +PREFIX xsd: +PREFIX owl: +PREFIX swrl: +PREFIX swrlb: +PREFIX vitro: +PREFIX vivo: +PREFIX bibo: +PREFIX dcterms: +PREFIX event: +PREFIX foaf: +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 . + +} where { + ?person core:hasProfessionalServiceActivity ?activity . + + optional { + ?activity core:activityRelatedGrant ?grant . + } + +} \ No newline at end of file