moving OutreachActivity and ServiceActivity to mixed SPARQL and tab table strategy

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

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 .
 }

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 .
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/OutreachProviderRole.sparql

@@ -0,0 +1,29 @@
+PREFIX rdf:   <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs:  <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX xsd:   <http://www.w3.org/2001/XMLSchema#>
+PREFIX owl:   <http://www.w3.org/2002/07/owl#>
+PREFIX swrl:  <http://www.w3.org/2003/11/swrl#>
+PREFIX swrlb: <http://www.w3.org/2003/11/swrlb#>
+PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
+PREFIX vivo:  <http://vivo.library.cornell.edu/ns/0.1#>
+PREFIX bibo: <http://purl.org/ontology/bibo/>   
+PREFIX dcterms: <http://purl.org/dc/terms/>
+PREFIX event: <http://purl.org/NET/c4dm/event.owl#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX core: <http://vivoweb.org/ontology/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 .
+      }   
+}

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 .
 }

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 .

productMods/WEB-INF/ontologies/update/sparqlConstructs/ServiceProviderRole.sparql

@@ -0,0 +1,30 @@
+PREFIX rdf:   <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs:  <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX xsd:   <http://www.w3.org/2001/XMLSchema#>
+PREFIX owl:   <http://www.w3.org/2002/07/owl#>
+PREFIX swrl:  <http://www.w3.org/2003/11/swrl#>
+PREFIX swrlb: <http://www.w3.org/2003/11/swrlb#>
+PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
+PREFIX vivo:  <http://vivo.library.cornell.edu/ns/0.1#>
+PREFIX bibo: <http://purl.org/ontology/bibo/>   
+PREFIX dcterms: <http://purl.org/dc/terms/>
+PREFIX event: <http://purl.org/NET/c4dm/event.owl#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX core: <http://vivoweb.org/ontology/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 .
+     }
+      
+}