Merge branch 'maint-rel-1.6' into develop

doc/install.html

@@ -339,6 +339,25 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
                             es_MX
                         </td>
                     </tr>
+                    <tr>
+                        <td colspan="2">
+							These values are used when deploying VIVO as an OpenSocial container
+							and integrating with OpenSocial gadgets 
+							(see <a href="#opensocial">Step 13</a>, below). If you are creating
+							a VIVO installation that does not use OpenSocial gadgets, these values are omitted.
+                        </td>
+                    </tr>
+                    <tr class="odd_row">
+                        <td>
+                          OpenSocial.shindigURL<br>
+                          OpenSocial.tokenService<br>
+                          OpenSocial.tokenKeyFile<br>
+                          OpenSocial.sandbox
+                        </td>
+                        <td>
+                           &nbsp;
+                        </td>
+                    </tr>
                 </tbody>
             </table>
 
@@ -938,26 +957,6 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
                         </td>
                     </tr>
                     
-                    <tr>
-                        <td colspan="2">
-							These values are used when deploying VIVO as an OpenSocial container
-							and integrating with OpenSocial gadgets 
-							(see <a href="#opensocial">Step 13</a>, below). If you are creating
-							a VIVO installation that does not use OpenSocial gadgets, these values are omitted.
-                        </td>
-                    </tr>
-                    <tr class="odd_row">
-                        <td>
-                          OpenSocial.shindigURL<br>
-                          OpenSocial.tokenService<br>
-                          OpenSocial.tokenKeyFile<br>
-                          OpenSocial.sandbox
-                        </td>
-                        <td>
-                           &nbsp;
-                        </td>
-                    </tr>
-
                 </tbody>
             </table>
 

doc/setting_up_orng.html

@@ -188,7 +188,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
             
             <h3 id="vivo_settings">I.iv Configure VIVO</h3>
             <p>
-            	In the VIVO home directory, the file called <em>runtime.properties</em>
+            	In the VIVO distribution directory, the file called <em>build.properties</em>
             	contains configuration options for the VIVO application.
             	You must set some additional parameters so VIVO will be able to communicate with Shindig-ORNG. 
             </p>
@@ -333,7 +333,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
             			<ul>
 	            			<li>
 	            				VIVO was not re-deployed with <tt>ant deploy</tt> after the OpenSocial
-	            				values were set in <em>runtime.properties</em>
+	            				values were set in <em>build.properties</em>
 	            			</li>
             			</ul>
             		</td>
@@ -405,7 +405,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
             		<td>
             			<ul>
 	            			<li>
-	            				<em>OpenSocial.tokenKeyFile</em> is not set in <em>runtime.properties</em>,
+	            				<em>OpenSocial.tokenKeyFile</em> is not set in <em>build.properties</em>,
 	            				or the file does not exist at the specified location.
 	            			</li>
             			</ul>
@@ -449,7 +449,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
             		<td>
             			<ul>
 	            			<li>
-	            				In <em>runtime.properties</em>, <em>OpenSocial.tokenService</em> is not set correctly.
+	            				In <em>build.properties</em>, <em>OpenSocial.tokenService</em> is not set correctly.
 	            			</li>
             			</ul>
             		</td>
@@ -692,11 +692,11 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
 	        <h3 id="redeploying">III.i. Re-running the deployment script</h2>
 	        
 	        <p>
-	        	The OpenSocial framework relies on several of the settings in the <em>runtime.properties</em> file, 
+	        	The OpenSocial framework relies on several of the settings in the <em>build.properties</em> and <em>runtime.properties</em> files, 
 	        	in addition to the ones that are explicitly linked to it.
 	        </p>
 	        <p>
-	        	Each time you change the settings in <em>runtime.properties</em>, you should re-deploy
+	        	Each time you change the settings in <em>build.properties</em> or <em>runtime.properties</em>, you should re-deploy
 	        	the framework with
 	        	<pre>          ant orng</pre>
 	        </p>
@@ -750,12 +750,12 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
 				Disabling the gadgets, as above, will remove essentially all of the OpenSocial processing
 				within VIVO. To remove the remainder of it, you can disable the connection between
 				VIVO and the OpenSocial service. Do this by removing or commenting 
-				the <em>OpenSocial</em> properties in <em>runtime.properties</em> 
+				the <em>OpenSocial</em> properties in <em>build.properties</em> 
 				(see <a href="#vivo_settings">section I.iv. Configure VIVO</a>).
 			</p>
 			
 			<p>
-				Restart Tomcat to make this change take effect.
+				To make this change take effect, re-deploy VIVO and restart Tomcat.
 			</p>
 			
 			<h4>Remove the OpenSocial webapp from Tomcat</h4>

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdviseeRole.sparql

@@ -6,18 +6,14 @@ CONSTRUCT {
     ?advisee <http://purl.obolibrary.org/obo/RO_0000053> _:AdviseeRole .
     _:AdviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisee .
     _:AdviseeRole a vivo:AdviseeRole .
-    ?advisor <http://purl.obolibrary.org/obo/RO_0000053> _:AdvisorRole .
-    _:AdvisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisor .
-    _:AdvisorRole a vivo:AdvisorRole .
     _:AdviseeRole vivo:relatedBy ?advisingRelationship .
     ?advisingRelationship vivo:relates _:AdviseeRole .
-    _:AdvisorRole vivo:relatedBy ?advisingRelationship .
-    ?advisingRelationship vivo:relates _:AdvisorRole .
     ?advisingRelationship vivo:relates ?advisee .
-    ?advisingRelationship vivo:relates ?advisor .
     ?advisee vivo:relatedBy ?advisingRelationship .
-    ?advisor vivo:relatedBy ?advisingRelationship .
 } WHERE {
     ?advisee vivo:adviseeIn ?advisingRelationship .
-    ?advisor vivo:advisorIn ?advisingRelationship .
+    FILTER NOT EXISTS {
+        ?advisee <http://purl.obolibrary.org/obo/RO_0000053> ?adviseeRoleNode .
+        ?adviseeRoleNode vivo:relatedBy ?advisingRelationship .
+    }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdvisorRole.sparql

@@ -0,0 +1,19 @@
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+
+CONSTRUCT {
+    ?advisor <http://purl.obolibrary.org/obo/RO_0000053> _:AdvisorRole .
+    _:AdvisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisor .
+    _:AdvisorRole a vivo:AdvisorRole .
+    _:AdvisorRole vivo:relatedBy ?advisingRelationship .
+    ?advisingRelationship vivo:relates _:AdvisorRole .
+    ?advisingRelationship vivo:relates ?advisor .
+    ?advisor vivo:relatedBy ?advisingRelationship .
+} WHERE {
+    ?advisor vivo:advisorIn ?advisingRelationship .
+    FILTER NOT EXISTS {
+        ?advisor <http://purl.obolibrary.org/obo/RO_0000053> ?advisorRoleNode .
+        ?advisorRoleNode vivo:relatedBy ?advisingRelationship .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/Editorship.sparql

@@ -15,4 +15,8 @@ CONSTRUCT {
       ?document vivo:editor ?person
       FILTER NOT EXISTS { ?person vivo:editorOf ?document } 
     } 
+    FILTER NOT EXISTS {
+        ?person vivo:relatedBy ?editorshipNode .
+        ?editorshipNode vivo:relates ?document .
+    }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/LeaderRole.sparql

@@ -14,4 +14,8 @@ CONSTRUCT {
     { ?org vivo:currentlyHeadedBy ?person 
       FILTER NOT EXISTS { ?person vivo:currentlyHeadOf ?org }
     }
+    FILTER NOT EXISTS {
+        ?person <http://purl.obolibrary.org/obo/RO_0000053> ?leaderRoleNode .
+        ?leaderRoleNode vivo:roleContributesTo ?org .
+    }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/MemberRole.sparql

@@ -14,4 +14,8 @@ CONSTRUCT {
      { ?org vivo:hasCurrentMember ?person 
        FILTER NOT EXISTS { ?person vivo:currentMemberOf ?org }
      }
+     FILTER NOT EXISTS {
+         ?person <http://purl.obolibrary.org/obo/RO_0000053> ?memberRoleNode .
+         ?memberRoleNode vivo:roleContributesTo ?org .
+     }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/grantAdmin.sparql

@@ -16,4 +16,9 @@ CONSTRUCT {
     { ?grant vivo:administeredBy ?agent 
       FILTER NOT EXISTS { ?agent vivo:administers ?grant } 
     }
+    FILTER NOT EXISTS {
+        ?agent <http://purl.obolibrary.org/obo/RO_0000053> ?adminRoleNode .
+        ?adminRoleNode a vivo:AdministratorRole .
+        ?adminRoleNode vivo:relatedBy ?grant .
+    }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/Grant.sparql

@@ -7,6 +7,7 @@ CONSTRUCT {
     ?grant vivo:relates ?agent
 } WHERE {
     ?agent <http://purl.obolibrary.org/obo/RO_0000053> ?role .
-    ?role vivo:relatedBy ?grant
+    ?role vivo:relatedBy ?grant .
+    ?grant a vivo:Grant .
     FILTER NOT EXISTS { ?grant vivo:relates ?agent } 
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/awardedDegree.sparql

@@ -22,4 +22,8 @@ CONSTRUCT {
         ?educationalProcess <http://purl.obolibrary.org/obo/RO_0000057> ?org . 
         ?org a foaf:Organization 
     }
+    FILTER NOT EXISTS {
+        ?educationalProcess <http://purl.obolibrary.org/obo/RO_0002234>  ?awardedDegreeNode .
+        ?person vivo:relatedBy ?awardedDegreeNode .
+    }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/contributingAdvising.sparql

@@ -6,10 +6,10 @@ CONSTRUCT {
     ?educationalProcess <http://purl.obolibrary.org/obo/BFO_0000055> ?role .
     ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?educationalProcess .
 } WHERE {
+    ?educationalProcess vivo:contributingAdvising ?advising .
     ?person <http://purl.obolibrary.org/obo/RO_0000056> ?educationalProcess .
     ?person a foaf:Person .
     ?educationalProcess a vivo:EducationalProcess .
-    ?educationalProcess vivo:contributingAdvising ?advising .
     ?advising vivo:relates ?role .
     ?role a <http://purl.obolibrary.org/obo/BFO_0000023> .
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-0.sparql

@@ -1,24 +0,0 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-
-CONSTRUCT {
-    ?s arg:ARG_2000028 _:vcard .
-    _:vcard arg:ARG_2000029 ?s .
-    _:vcard a v:Individual .
-} WHERE {
-    ?s a foaf:Person
-    FILTER ( 
-        EXISTS { ?s foaf:firstName ?firstName } ||
-        EXISTS { ?s foaf:lastName ?lastName } ||
-        EXISTS { ?s vivo:middleName ?middleName } ||
-        EXISTS { ?s vivo:email ?email } || 
-        EXISTS { ?s vivo:primaryEmail ?primaryEmail } ||
-        EXISTS { ?s vivo:phoneNumber ?phoneNumber } ||
-        EXISTS { ?s vivo:primaryPhoneNumber ?primaryPhoneNumber } ||
-        EXISTS { ?s vivo:faxNumber ?faxNumber } ||
-        EXISTS { ?s vivo:mailingAddress ?address } ||
-        EXISTS { ?s vivo:webpage ?webpage } 
-    )
-}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-0a.sparql

@@ -0,0 +1,15 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Individual .
+} WHERE {
+    ?s foaf:firstName ?firstName 
+    FILTER NOT EXISTS {  
+      ?s arg:ARG_2000028 ?vcard
+    }   
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-0b.sparql

@@ -0,0 +1,15 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Individual .
+} WHERE {
+    ?s foaf:lastName ?lastName 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-0c.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Individual .
+} WHERE {
+    ?s vivo:middleName ?middleName .
+    ?s a foaf:Person 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard
+    } 
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-0d.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Individual .
+} WHERE {
+    ?s vivo:email ?email  .
+    ?s a foaf:Person .
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-0e.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Individual .
+} WHERE {
+    ?s vivo:primaryEmail ?email  .
+    ?s a foaf:Person .
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-0f.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Individual .
+} WHERE {
+    ?s vivo:phoneNumber ?phoneNumber .
+    ?s a foaf:Person .
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-0g.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Individual .
+} WHERE {
+    ?s vivo:primaryPhoneNumber ?primaryPhoneNumber .
+    ?s a foaf:Person 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-0h.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Individual .
+} WHERE {
+    ?s vivo:faxNumber ?faxNumber .
+    ?s a foaf:Person 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-0i.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Individual .
+} WHERE {
+    ?s vivo:mailingAddress ?address .
+    ?s a foaf:Person 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-0j.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Individual .
+} WHERE {
+    ?s vivo:webpage ?webpage .
+    ?s a foaf:Person 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    } 
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-1.sparql

@@ -1,21 +0,0 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-
-CONSTRUCT {
-    ?s arg:ARG_2000028 _:vcard .
-    _:vcard arg:ARG_2000029 ?s .
-    _:vcard a v:Organization .
-} WHERE {
-    ?s a foaf:Organization
-    FILTER ( 
-        EXISTS { ?s vivo:email ?email } || 
-        EXISTS { ?s vivo:primaryEmail ?primaryEmail } ||
-        EXISTS { ?s vivo:phoneNumber ?phoneNumber } ||
-        EXISTS { ?s vivo:primaryPhoneNumber ?primaryPhoneNumber } ||
-        EXISTS { ?s vivo:faxNumber ?faxNumber } ||
-        EXISTS { ?s vivo:mailingAddress ?address } ||
-        EXISTS { ?s vivo:webpage ?webpage }
-    )
-}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-1d.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Organization .
+} WHERE {
+    ?s vivo:email ?email  .
+    ?s a foaf:Organization .
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-1e.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Organization .
+} WHERE {
+    ?s vivo:primaryEmail ?email  .
+    ?s a foaf:Organization .
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-1f.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Organization .
+} WHERE {
+    ?s vivo:phoneNumber ?phoneNumber .
+    ?s a foaf:Organization .
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-1g.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Organization .
+} WHERE {
+    ?s vivo:primaryPhoneNumber ?primaryPhoneNumber .
+    ?s a foaf:Organization 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-1h.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Organization .
+} WHERE {
+    ?s vivo:faxNumber ?faxNumber .
+    ?s a foaf:Organization 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-1i.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Organization .
+} WHERE {
+    ?s vivo:mailingAddress ?address .
+    ?s a foaf:Organization 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-1j.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Organization .
+} WHERE {
+    ?s vivo:webpage ?webpage .
+    ?s a foaf:Organization 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    } 
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-2.sparql

@@ -1,21 +0,0 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-
-CONSTRUCT {
-    ?s arg:ARG_2000028 _:vcard .
-    _:vcard arg:ARG_2000029 ?s .
-    _:vcard a v:Group .
-} WHERE {
-    ?s a foaf:Group
-    FILTER ( 
-        EXISTS { ?s vivo:email ?email } || 
-        EXISTS { ?s vivo:primaryEmail ?primaryEmail } ||
-        EXISTS { ?s vivo:phoneNumber ?phoneNumber } ||
-        EXISTS { ?s vivo:primaryPhoneNumber ?primaryPhoneNumber } ||
-        EXISTS { ?s vivo:faxNumber ?faxNumber } ||
-        EXISTS { ?s vivo:mailingAddress ?address } ||
-        EXISTS { ?s vivo:webpage ?webpage } 
-    )
-}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-2d.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Group .
+} WHERE {
+    ?s vivo:email ?email  .
+    ?s a foaf:Group .
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-2e.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Group .
+} WHERE {
+    ?s vivo:primaryEmail ?email  .
+    ?s a foaf:Group .
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-2f.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Group .
+} WHERE {
+    ?s vivo:phoneNumber ?phoneNumber .
+    ?s a foaf:Group .
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-2g.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Group .
+} WHERE {
+    ?s vivo:primaryPhoneNumber ?primaryPhoneNumber .
+    ?s a foaf:Group 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-2h.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Group .
+} WHERE {
+    ?s vivo:faxNumber ?faxNumber .
+    ?s a foaf:Group 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-2i.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Group .
+} WHERE {
+    ?s vivo:mailingAddress ?address .
+    ?s a foaf:Group 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-2j.sparql

@@ -0,0 +1,16 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+
+CONSTRUCT {
+    ?s arg:ARG_2000028 _:vcard .
+    _:vcard arg:ARG_2000029 ?s .
+    _:vcard a v:Group .
+} WHERE {
+    ?s vivo:webpage ?webpage .
+    ?s a foaf:Group 
+    FILTER NOT EXISTS {
+        ?s arg:ARG_2000028 ?vcard .
+    } 
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard2.sparql

@@ -1,36 +0,0 @@
-PREFIX arg: <http://purl.obolibrary.org/obo/> 
-PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
-PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
-PREFIX vivo: <http://vivoweb.org/ontology/core#> 
-PREFIX bibo: <http://purl.org/ontology/bibo/>
-
-CONSTRUCT {
-    ?vcard v:hasName _:name .
-    _:name a v:Name .
-    _:name v:givenName ?firstName .
-    _:name vivo:middleName ?middleName .
-    _:name v:familyName ?lastName .
-    _:name v:honorificPrefix ?prefix .
-    _:name v:honorificSuffix ?suffix .
-} WHERE {
-     ?s arg:ARG_2000028 ?vcard .
-    OPTIONAL {
-        ?s foaf:firstName ?firstName .
-        BIND("yes" as ?test)
-    } 
-    OPTIONAL {
-        ?s foaf:lastName ?lastName .
-        BIND("yes" as ?test)
-    } 
-    OPTIONAL {
-        ?s vivo:middleName ?middleName 
-        BIND("yes" as ?test)
-    } 
-    OPTIONAL {
-        ?s bibo:prefixName ?prefix 
-    }
-    OPTIONAL {
-        ?s bibo:suffixName ?suffix
-    }
-    FILTER(bound(?test))
-}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard22.sparql

@@ -9,6 +9,9 @@ CONSTRUCT {
     _:title a v:Title .
     _:title v:title ?preferredTitle .
 } WHERE {
-     ?s arg:ARG_2000028 ?vcard .
      ?s <http://vivoweb.org/ontology/core#preferredTitle> ?preferredTitle .
+     ?s arg:ARG_2000028 ?vcard .
+     FILTER NOT EXISTS {
+         ?vcard v:hasTitle ?title
+     }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard2a.sparql

@@ -0,0 +1,17 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX bibo: <http://purl.org/ontology/bibo/>
+
+CONSTRUCT {
+    ?vcard v:hasName _:name .
+    _:name a v:Name .
+    _:name v:givenName ?firstName .
+} WHERE {
+     ?s foaf:firstName ?firstName .
+     ?s arg:ARG_2000028 ?vcard .
+     FILTER NOT EXISTS {
+         ?vcard v:hasName ?name
+     }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard2b.sparql

@@ -0,0 +1,13 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX bibo: <http://purl.org/ontology/bibo/>
+
+CONSTRUCT {
+    ?name v:givenName ?firstName .
+} WHERE {
+     ?s foaf:firstName ?firstName .
+     ?s arg:ARG_2000028 ?vcard .
+     ?vcard v:hasName ?name
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard2c.sparql

@@ -0,0 +1,17 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX bibo: <http://purl.org/ontology/bibo/>
+
+CONSTRUCT {
+    ?vcard v:hasName _:name .
+    _:name a v:Name .
+    _:name vivo:middleName ?middleName .
+} WHERE {
+     ?s vivo:middleName ?middleName . 
+     ?s arg:ARG_2000028 ?vcard .
+     FILTER NOT EXISTS {
+         ?vcard v:hasName ?name
+     }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard2d.sparql

@@ -0,0 +1,14 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX bibo: <http://purl.org/ontology/bibo/>
+
+CONSTRUCT {
+    ?name vivo:middleName ?middleName .
+} WHERE {
+     ?s vivo:middleName ?middleName . 
+     ?s a foaf:Person .
+     ?s arg:ARG_2000028 ?vcard .
+     ?vcard v:hasName ?name
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard2e.sparql

@@ -0,0 +1,17 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX bibo: <http://purl.org/ontology/bibo/>
+
+CONSTRUCT {
+    ?vcard v:hasName _:name .
+    _:name a v:Name .
+    _:name v:familyName ?lastName .
+} WHERE {
+     ?s foaf:lastName ?lastName . 
+     ?s arg:ARG_2000028 ?vcard .
+     FILTER NOT EXISTS {
+         ?vcard v:hasName ?name
+     }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard2f.sparql

@@ -0,0 +1,13 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX bibo: <http://purl.org/ontology/bibo/>
+
+CONSTRUCT {
+    ?name v:familyName ?lastName .
+} WHERE {
+     ?s foaf:lastName ?lastName . 
+     ?s arg:ARG_2000028 ?vcard .
+     ?vcard v:hasName ?name
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard2g.sparql

@@ -0,0 +1,17 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX bibo: <http://purl.org/ontology/bibo/>
+
+CONSTRUCT {
+    ?vcard v:hasName _:name .
+    _:name a v:Name .
+    _:name v:honorificPrefix ?prefixName .
+} WHERE {
+     ?s bibo:prefixName ?prefixName . 
+     ?s arg:ARG_2000028 ?vcard .
+     FILTER NOT EXISTS {
+         ?vcard v:hasName ?name
+     }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard2h.sparql

@@ -0,0 +1,13 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX bibo: <http://purl.org/ontology/bibo/>
+
+CONSTRUCT {
+    ?name v:honorificPrefix ?prefixName .
+} WHERE {
+     ?s bibo:prefixName ?prefixName . 
+     ?s arg:ARG_2000028 ?vcard .
+     ?vcard v:hasName ?name
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard2i.sparql

@@ -0,0 +1,17 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX bibo: <http://purl.org/ontology/bibo/>
+
+CONSTRUCT {
+    ?vcard v:hasName _:name .
+    _:name a v:Name .
+    _:name v:honorificSuffix ?suffixName .
+} WHERE {
+     ?s bibo:suffixName ?suffixName . 
+     ?s arg:ARG_2000028 ?vcard .
+     FILTER NOT EXISTS {
+         ?vcard v:hasName ?name
+     }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard2j.sparql

@@ -0,0 +1,13 @@
+PREFIX arg: <http://purl.obolibrary.org/obo/> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/> 
+PREFIX v:   <http://www.w3.org/2006/vcard/ns#> 
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX bibo: <http://purl.org/ontology/bibo/>
+
+CONSTRUCT {
+    ?name v:honorificSuffix ?suffixName .
+} WHERE {
+     ?s bibo:suffixName ?suffixName . 
+     ?s arg:ARG_2000028 ?vcard .
+     ?vcard v:hasName ?name
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard3.sparql

@@ -8,6 +8,9 @@ CONSTRUCT {
     _:email a v:Email .
     _:email v:email ?email .
 } WHERE {
+    ?s vivo:email ?email .
     ?s arg:ARG_2000028 ?vcard .
-    ?s vivo:email ?email
+    FILTER NOT EXISTS {
+        ?vcard v:hasEmail ?emailnode
+    }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard4.sparql

@@ -9,6 +9,10 @@ CONSTRUCT {
     _:primaryEmail a v:Work .
     _:primaryEmail v:email ?primaryEmail . 
 } WHERE {
+     ?s vivo:primaryEmail ?primaryEmail .
      ?s arg:ARG_2000028 ?vcard .
-     ?s vivo:primaryEmail ?primaryEmail 
+     FILTER NOT EXISTS {
+         ?vcard v:hasEmail ?email .
+         ?email a v:Work .
+     }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard5.sparql

@@ -9,6 +9,9 @@ CONSTRUCT {
     _:telephone a v:Voice .
     _:telephone v:telephone ?phoneNumber .
 } WHERE {
+    ?s vivo:phoneNumber ?phoneNumber .
     ?s arg:ARG_2000028 ?vcard .
-    ?s vivo:phoneNumber ?phoneNumber 
+    FILTER NOT EXISTS {
+        ?vcard v:hasTelephone ?telephoneNode .
+    }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard6.sparql

@@ -10,6 +10,10 @@ CONSTRUCT {
     _:primaryTelephone a v:Work .
     _:primaryTelephone v:telephone ?primaryPhoneNumber .
 } WHERE {
+    ?s vivo:primaryPhoneNumber ?primaryPhoneNumber .
     ?s arg:ARG_2000028 ?vcard .
-    ?s vivo:primaryPhoneNumber ?primaryPhoneNumber
+    FILTER NOT EXISTS {
+        ?vcard v:hasTelephone ?telephoneNode .
+        ?vcard a v:Work .
+    }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard7.sparql

@@ -9,6 +9,10 @@ CONSTRUCT {
     _:fax a v:Fax.
     _:fax v:telephone ?faxNumber . 
 } WHERE {
+    ?s vivo:faxNumber ?faxNumber .
     ?s arg:ARG_2000028 ?vcard .
-    ?s vivo:faxNumber ?faxNumber
+    FILTER NOT EXISTS {
+        ?vcard v:hasTelephone ?faxNode .
+        ?faxNode a v:Fax .
+    }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard8.sparql

@@ -11,13 +11,16 @@ CONSTRUCT {
     _:address v:region ?addressState .
     _:address v:postalCode ?addressPostalCode .
     _:address v:country ?addressCountry .
+    _:address <http://purl.obolibrary.org/obo/RO_0001025> ?location .
+    ?location <http://purl.obolibrary.org/obo/RO_0001015> _:address .
 } WHERE {
-    ?s arg:ARG_2000028 ?vcard .
     ?s vivo:mailingAddress ?address .
-    ?address vivo:addressCity ?addressCity .
+    OPTIONAL { ?address vivo:addressCity ?addressCity }
-    ?address vivo:addressState ?addressState .
+    OPTIONAL { ?address vivo:addressState ?addressState }
-    ?address vivo:addressCountry ?addressCountry .
+    OPTIONAL { ?address vivo:addressPostalCode ?addressPostalCode }
-    ?address vivo:addressPostalCode ?addressPostalCode .
+    OPTIONAL { ?address vivo:addressCountry ?addressCountry }
+    OPTIONAL { ?address vivo:hasGeographicLocation ?location }
+    ?s arg:ARG_2000028 ?vcard .
     OPTIONAL {
         ?address vivo:address1 ?address1 .
         ?address vivo:address2 ?address2 .
@@ -34,4 +37,7 @@ CONSTRUCT {
         ?address vivo:address1 ?address1
         BIND(?address1 as ?streetAddress)
     } 
+    FILTER NOT EXISTS {
+        ?vcard v:hasAddress ?addressNode
+    }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard9.sparql

@@ -10,10 +10,13 @@ CONSTRUCT {
    _:url v:url ?linkURI .
    _:url rdfs:label ?linkAnchorText
 } WHERE {
-    ?s arg:ARG_2000028 ?vcard .
     ?s vivo:webpage ?webpage .
     ?webpage vivo:linkURI ?linkURI .
+    ?s arg:ARG_2000028 ?vcard .
     OPTIONAL {
         ?webpage vivo:linkAnchorText ?linkAnchorText
     }
+    FILTER NOT EXISTS {
+        ?vcard v:hasURL ?URLNode
+    }
 }

productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql

@@ -3,15 +3,9 @@ PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
-    ?advisee vivo:adviseeIn ?advisingRelationship .
-    ?advisingRelationship vivo:advisee ?advisee .
     ?advisor vivo:advisorIn ?advisingRelationship .
     ?advisingRelationship vivo:advisor ?advisor 
 } WHERE {
-    ?advisee vivo:adviseeIn ?advisingRelationship .
-    OPTIONAL {
-        ?advisingRelationship vivo:advisee ?advisee .
-    }
     ?advisor vivo:advisorIn ?advisingRelationship .
     OPTIONAL {
          ?advisingRelationship vivo:advisor ?advisor 

productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql

@@ -0,0 +1,13 @@
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX owl: <http://www.w3.org/2002/07/owl#> 
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+
+CONSTRUCT {
+    ?advisee vivo:adviseeIn ?advisingRelationship .
+    ?advisingRelationship vivo:advisee ?advisee .
+} WHERE {
+    ?advisee vivo:adviseeIn ?advisingRelationship .
+    OPTIONAL {
+        ?advisingRelationship vivo:advisee ?advisee .
+    }
+}

productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/vcardDel.sparql

@@ -17,6 +17,7 @@ CONSTRUCT {
         ?s vivo:faxNumber ?faxNumber .
         ?s vivo:mailingAddress ?address .
         ?address ?addressP ?addressO .
+        ?addressS ?addressQ ?address .
         ?s vivo:webpage ?webpage .
         ?webpage ?webpageP ?webpageO .
 } WHERE {
@@ -27,7 +28,8 @@ CONSTRUCT {
         ?s foaf:lastName ?lastName .
     } 
     UNION {
-        ?s vivo:middleName ?middleName 
+        ?s vivo:middleName ?middleName .
+        ?s a foaf:Person .
     }
     UNION {
         ?s bibo:prefixName ?prefix 
@@ -57,6 +59,10 @@ CONSTRUCT {
         ?s vivo:mailingAddress ?address .
         ?address ?addressP ?addressO
     } 
+    UNION {
+        ?s vivo:mailingAddress ?address .
+        ?addressS ?addressQ ?address 
+    }
     UNION {
         ?s vivo:webpage ?webpage 
     }

productMods/WEB-INF/rich-export/address/address.sparql

@@ -1,8 +1,12 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
+PREFIX vcard: <http://www.w3.org/2006/vcard/ns#>
+
 
 CONSTRUCT {
      ?address ?property ?object .
 } WHERE {
-     PERSON_URI core:mailingAddress ?address . 
+     PERSON_URI obo:ARG_2000028 ?vcard .
+     ?vcard vcard:hasAddress ?address .
      ?address ?property ?object .
 }

productMods/WEB-INF/rich-export/address/locationOfAddress.sparql

@@ -1,9 +1,12 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
+PREFIX vcard: <http://www.w3.org/2006/vcard/ns#>
 
 CONSTRUCT {
      ?geographicLocation ?property ?object .
 } WHERE {
-     PERSON_URI core:mailingAddress ?address . 
+     PERSON_URI obo:ARG_2000028 ?vcard .
-     ?address core:hasGeographicLocation ?geographicLocation .
+     ?vcard vcard:hasAddress ?address .
+     ?address obo:RO_0001025 ?geographicLocation .
      ?geographicLocation ?property ?object .
 }

productMods/WEB-INF/rich-export/advising/advisee.sparql

@@ -1,9 +1,16 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
-     ?person ?property ?object .
+     ?advisee ?property ?object .
 } WHERE {
-     PERSON_URI core:advisorIn ?advisingRelationship .
+     PERSON_URI core:relatedBy ?advisingRelationship .
-     ?advisingRelationship core:advisee ?person .
+     ?advisingRelationship a core:AdvisingRelationship .
-     ?person ?property ?object .
+     ?advisingRelationship core:relates ?advisee .
+     ?advisee a foaf:Person .
+     ?advisee obo:RO_0000053 ?adviseeRole .
+     ?adviseeRole a core:AdviseeRole .
+     ?adviseeRole core:relatedBy ?advisingRelationship .
+     ?advisee ?property ?object .
 }

productMods/WEB-INF/rich-export/advising/adviseesDegreeAlt.sparql

@@ -1,11 +1,21 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
      ?degree ?property ?object
 } WHERE {
-     PERSON_URI core:advisorIn ?advisingRelationship .
+     PERSON_URI core:relatedBy ?advisingRelationship .
-     ?advisingRelationship core:advisee ?advisee .
+     ?advisingRelationship a core:AdvisingRelationship .
-     ?advisee core:educationalTraining ?educationalTraining .
+     ?advisingRelationship core:relates ?advisee .
-     ?educationalTraining core:degreeEarned ?degree .
+     ?advisee a foaf:Person .
+     ?advisee obo:RO_0000053 ?adviseeRole .
+     ?adviseeRole a core:AdviseeRole .
+     ?adviseeRole core:relatedBy ?advisingRelationship .
+     ?advisee core:relates ?educationalTraining .
+     ?educationalTraining a core:EducationalProcess .
+     ?educationalTraining obo:RO_0002234 ?awardedDegree .
+     ?awardedDegree core:relates ?degree .
+     ?degree a core:AcademicDegree .
      ?degree ?property ?object
 }

productMods/WEB-INF/rich-export/advising/adviseesEducationEndDate.sparql

@@ -1,11 +1,19 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
      ?dateTimeValue ?property ?object .
 } WHERE {
-     PERSON_URI core:advisorIn ?advisingRelationship .
+     PERSON_URI core:relatedBy ?advisingRelationship .
-     ?advisingRelationship core:advisee ?advisee .
+     ?advisingRelationship a core:AdvisingRelationship .
-     ?advisee core:educationalTraining ?educationalTraining .
+     ?advisingRelationship core:relates ?advisee .
+     ?advisee a foaf:Person .
+     ?advisee obo:RO_0000053 ?adviseeRole .
+     ?adviseeRole a core:AdviseeRole .
+     ?adviseeRole core:relatedBy ?advisingRelationship .
+     ?advisee core:relates ?educationalTraining .
+     ?educationalTraining a core:EducationalProcess .
      ?educationalTraining core:dateTimeInterval ?dateTimeInterval .
      ?dateTimeInterval core:end ?dateTimeValue .
      ?dateTimeValue ?property ?object .

productMods/WEB-INF/rich-export/advising/adviseesEducationalInsitituionAlt.sparql

@@ -1,12 +1,21 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
 CONSTRUCT {
      ?educationalInstitution rdfs:label ?label
 } WHERE {
-     PERSON_URI core:advisorIn ?advisingRelationship .
+     PERSON_URI core:relatedBy ?advisingRelationship .
-     ?advisingRelationship core:advisee ?advisee .
+     ?advisingRelationship a core:AdvisingRelationship .
-     ?advisee core:educationalTraining ?educationalTraining .
+     ?advisingRelationship core:relates ?advisee .
-     ?educationalTraining core:trainingAtOrganization ?educationalInstitution .
+     ?advisee a foaf:Person .
+     ?advisee obo:RO_0000053 ?adviseeRole .
+     ?adviseeRole a core:AdviseeRole .
+     ?adviseeRole core:relatedBy ?advisingRelationship .
+     ?advisee core:relates ?educationalTraining .
+     ?educationalTraining a core:EducationalProcess .
+     ?educationalTraining obo:RO_0000057 ?educationalInstitution .
+     ?educationalInstitution a foaf:Organization .
      ?educationalInstitution rdfs:label ?label
 }

productMods/WEB-INF/rich-export/advising/associatedDegree.sparql

@@ -1,9 +1,11 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
      ?degree ?property ?object .
 } WHERE {
-     PERSON_URI core:advisorIn ?advisingRelationship .
+     PERSON_URI core:relatedBy ?advisingRelationship .
+     ?advisingRelationship a core:AdvisingRelationship .
      ?advisingRelationship core:degreeCandidacy ?degree .
      ?degree ?property ?object .
 }

productMods/WEB-INF/rich-export/advising/associatedEducationalTraining.sparql

@@ -3,7 +3,8 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 CONSTRUCT {
      ?educationalTraining ?property ?object .
 } WHERE {
-     PERSON_URI core:advisorIn ?advisingRelationship .
+     PERSON_URI core:relatedBy ?advisingRelationship .
+     ?advisingRelationship a core:AdvisingRelationship .
      ?advisingRelationship core:advisingContributionTo ?educationalTraining .
      ?educationalTraining ?property ?object .
 }

productMods/WEB-INF/rich-export/advising/associatedEducationalTrainingAlt.sparql

@@ -1,10 +1,18 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
      ?educationalTraining ?property ?object .
 } WHERE {
-     PERSON_URI core:advisorIn ?advisingRelationship .
+     PERSON_URI core:relatedBy ?advisingRelationship .
-     ?advisingRelationship core:advisee ?advisee .
+     ?advisingRelationship a core:AdvisingRelationship .
-     ?advisee core:educationalTraining ?educationalTraining .
+     ?advisingRelationship core:relates ?advisee .
+     ?advisee a foaf:Person .
+     ?advisee obo:RO_0000053 ?adviseeRole .
+     ?adviseeRole a core:AdviseeRole .
+     ?adviseeRole core:relatedBy ?advisingRelationship .
+     ?advisee core:relates ?educationalTraining .
+     ?educationalTraining a core:EducationalProcess .
      ?educationalTraining ?property ?object .
 }

productMods/WEB-INF/rich-export/award/award.sparql

@@ -3,7 +3,9 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 CONSTRUCT {
      ?award ?property ?object .
 } WHERE {
-     PERSON_URI core:awardOrHonor ?awardReceipt .
+     PERSON_URI core:relatedBy ?awardReceipt .
-     ?awardReceipt core:receiptOf ?award . 
+     ?awardReceipt a core:AwardReceipt .
+     ?awardReceipt core:relates ?award . 
+     ?award a core:Award .
      ?award ?property ?object .
 }

productMods/WEB-INF/rich-export/award/conferringOrganization.sparql

@@ -1,9 +1,12 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
      ?organization ?property ?object .
 } WHERE {
-     PERSON_URI core:awardOrHonor ?awardReceipt .
+     PERSON_URI core:relatedBy ?awardReceipt .
-     ?awardReceipt core:awardConferredBy ?organization . 
+     ?awardReceipt a core:AwardReceipt .
+     ?awardReceipt core:assignedBy ?organization . 
+     ?organization a foaf:Organization .
      ?organization ?property ?object .
 }

productMods/WEB-INF/rich-export/award/sponsoringOrganization.sparql

@@ -1,10 +1,13 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
      ?organization ?property ?object .
 } WHERE {
-     PERSON_URI core:awardOrHonor ?awardReceipt .
+     PERSON_URI core:relatedBy ?awardReceipt .
-     ?awardReceipt core:receiptOf ?award . 
+     ?awardReceipt a core:AwardReceipt .
+     ?awardReceipt core:relates ?award . 
+     ?award a core:Award .
      ?award core:sponsoredBy ?organization .
      ?organization ?property ?object .
 }

productMods/WEB-INF/rich-export/credential/credential.sparql

@@ -3,7 +3,9 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 CONSTRUCT {
      ?credential ?property ?object .
 } WHERE {
-     PERSON_URI core:hasCredential ?issuedCredential . 
+     PERSON_URI core:relatedBy ?issuedCredential . 
-     ?issuedCredential core:issuanceOfCredential ?credential .
+     ?issuedCredential a core:IssuedCredential . 
+     ?issuedCredential core:relates ?credential .
+     ?credential a core:Credential .
      ?credential ?property ?object .
 }

productMods/WEB-INF/rich-export/credential/credentialGoverningAuthority.sparql

@@ -3,8 +3,10 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 CONSTRUCT {
      ?organization ?property ?object .
 } WHERE {
-     PERSON_URI core:hasCredential ?issuedCredential . 
+     PERSON_URI core:relatedBy ?issuedCredential . 
-     ?issuedCredential core:issuanceOfCredential ?credential .
+     ?issuedCredential a core:IssuedCredential . 
+     ?issuedCredential core:relates ?credential .
+     ?credential a core:Credential .
      ?credential core:hasGoverningAuthority ?organization .
      ?organization ?property ?object .
 }

productMods/WEB-INF/rich-export/credential/issuedCredential.sparql

@@ -3,6 +3,7 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 CONSTRUCT {
      ?issuedCredential ?property ?object .
 } WHERE {
-     PERSON_URI core:hasCredential ?issuedCredential . 
+     PERSON_URI core:relatedBy ?issuedCredential . 
+     ?issuedCredential a core:IssuedCredential . 
      ?issuedCredential ?property ?object .
 }

productMods/WEB-INF/rich-export/credential/issuedCredentialExpirationDate.sparql

@@ -4,7 +4,8 @@ CONSTRUCT {
      ?date ?property ?object .
      ?precision ?property2 ?object2 .
 } WHERE {
-     PERSON_URI core:hasCredential ?issuedCredential . 
+     PERSON_URI core:relatedBy ?issuedCredential . 
+     ?issuedCredential a core:IssuedCredential . 
      ?issuedCredential core:expirationDate ?date .
      ?date ?property ?object .
      ?date core:dateTimePrecision ?precision .

productMods/WEB-INF/rich-export/credential/issuedCredentialIssueDate.sparql

@@ -4,7 +4,8 @@ CONSTRUCT {
      ?date ?property ?object .
      ?precision ?property2 ?object2 .
 } WHERE {
-     PERSON_URI core:hasCredential ?issuedCredential . 
+     PERSON_URI core:relatedBy ?issuedCredential . 
+     ?issuedCredential a core:IssuedCredential . 
      ?issuedCredential core:dateIssued ?date .
      ?date ?property ?object .
      ?date core:dateTimePrecision ?precision .

productMods/WEB-INF/rich-export/credential/issuedCredentialSubjectArea.sparql

@@ -3,7 +3,8 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 CONSTRUCT {
      ?subjectArea ?property ?object .
 } WHERE {
-     PERSON_URI core:hasCredential ?issuedCredential . 
+     PERSON_URI core:relatedBy ?issuedCredential . 
+     ?issuedCredential a core:IssuedCredential . 
      ?issuedCredential core:hasSubjectArea ?subjectArea .
      ?subjectArea ?property ?object .
 }

productMods/WEB-INF/rich-export/educationalTraining/educationalTraining.sparql

@@ -1,8 +1,10 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
      ?educationalTraining ?property ?object .
 } WHERE {
-     PERSON_URI core:educationalTraining ?educationalTraining . 
+     PERSON_URI obo:RO_0000056 ?educationalTraining . 
+     ?educationalTraining a core:EducationalProcess . 
      ?educationalTraining ?property ?object .
 }

productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingDegree.sparql

@@ -1,9 +1,14 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
      ?degree ?property ?object .
 } WHERE {
-     PERSON_URI core:educationalTraining ?educationalTraining . 
+     PERSON_URI obo:RO_0000056 ?educationalTraining . 
-     ?educationalTraining core:degreeEarned ?degree .
+     ?educationalTraining a core:EducationalProcess . 
+     ?educationalTraining obo:RO_0002234 ?awardedDegree .
+     ?awardedDegree a core:AwardedDegree .
+     ?awardedDegree core:relates ?degree .
+     ?degree a core:AcademicDegree .
      ?degree ?property ?object .
 }

productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingEndDate.sparql

@@ -1,10 +1,12 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
      ?dateTimeInterval core:end ?date .
      ?date ?property ?object .
 } WHERE {
-     PERSON_URI core:educationalTraining ?educationalTraining . 
+     PERSON_URI obo:RO_0000056 ?educationalTraining . 
+     ?educationalTraining a core:EducationalProcess . 
      ?educationalTraining core:dateTimeInterval ?dateTimeInterval .
      ?dateTimeInterval core:end ?date .
      ?date ?property ?object .

productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingLocation.sparql

@@ -1,10 +1,15 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
      ?geographicLocation ?property ?object .
 } WHERE {
-     PERSON_URI core:educationalTraining ?educationalTraining . 
+     PERSON_URI obo:RO_0000056 ?educationalTraining . 
-     ?educationalTraining core:trainingAtOrganization ?organization .
+     ?educationalTraining a core:EducationalProcess . 
-     ?organization core:hasGeographicLocation ?geographicLocation .
+     ?educationalTraining obo:RO_0000057 ?organization .
+     ?organization a foaf:Organization .
+     ?organization obo:RO_0001025 ?geographicLocation .
+     ?geographicLocation a core:GeographicLocation .
      ?geographicLocation ?property ?object .
 }

productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingOrganization.sparql

@@ -1,9 +1,13 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
      ?organization ?property ?object .
 } WHERE {
-     PERSON_URI core:educationalTraining ?educationalTraining . 
+     PERSON_URI obo:RO_0000056 ?educationalTraining . 
-     ?educationalTraining core:trainingAtOrganization ?organization .
+     ?educationalTraining a core:EducationalProcess . 
+     ?educationalTraining obo:RO_0000057 ?organization .
+     ?organization a foaf:Organization .
      ?organization ?property ?object .
 }

productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingStartDate.sparql

@@ -1,9 +1,11 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
      ?date ?property ?object .
 } WHERE {
-     PERSON_URI core:educationalTraining ?educationalTraining . 
+     PERSON_URI obo:RO_0000056 ?educationalTraining . 
+     ?educationalTraining a core:EducationalProcess . 
      ?educationalTraining core:dateTimeInterval ?dateTimeInterval .
      ?dateTimeInterval core:start ?date .
      ?date ?property ?object .

productMods/WEB-INF/rich-export/funding/grantAwardedBy.sparql

@@ -1,20 +1,23 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
 CONSTRUCT {
-     ?investigatorRole core:roleContributesTo ?grant .
-     ?grant core:grantAwardedBy ?awardingOrganization .
      ?awardingOrganization rdfs:label ?label 
 } WHERE {
     {
-      {PERSON_URI core:hasPrincipalInvestigatorRole ?investigatorRole }
+      {PERSON_URI core:relatedBy ?investigatorRole .
+       ?investigatorRole a core:PrincipalInvestigatorRole
+      }
         union
-      {PERSON_URI core:hasCo-PrincipalInvestigatorRole ?investigatorRole }   
+      {PERSON_URI core:relatedBy ?investigatorRole .
+       ?investigatorRole a core:CoPrincipalInvestigatorRole
+      }   
      }
      
-     ?investigatorRole core:roleContributesTo ?grant .
+     ?investigatorRole core:relatedBy ?grant .
      ?grant a core:Grant .
-     ?grant core:grantAwardedBy ?awardingOrganization .
+     ?grant core:assignedBy ?awardingOrganization .
+     ?awardingOrganization a foaf:Organization .
      ?awardingOrganization rdfs:label ?label 
 }

productMods/WEB-INF/rich-export/funding/grants.sparql

@@ -3,15 +3,19 @@ PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 
 CONSTRUCT {
      ?grant ?property ?object .
-     ?investigatorRole core:roleContributesTo ?grant .
+     ?investigatorRole core:relatedBy ?grant .
 } WHERE {
-    {
+     {
-      {PERSON_URI core:hasPrincipalInvestigatorRole ?investigatorRole }
+       { PERSON_URI core:relatedBy ?investigatorRole .
-        union
+         ?investigatorRole a core:PrincipalInvestigatorRole
-      {PERSON_URI core:hasCo-PrincipalInvestigatorRole ?investigatorRole }   
+       }
+         union
+       { PERSON_URI core:relatedBy ?investigatorRole .
+         ?investigatorRole a core:CoPrincipalInvestigatorRole
+       }   
      }
      
-     ?investigatorRole core:roleContributesTo ?grant .
+     ?investigatorRole core:relatedBy ?grant .
      ?grant a core:Grant .
      ?grant ?property ?object 
 }

productMods/WEB-INF/rich-export/membership/memberRoleIn.sparql

@@ -1,15 +1,11 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
      ?endeavor ?property ?object .
 } WHERE {
-     PERSON_URI core:hasMemberRole ?memberRole .
+     PERSON_URI obo:RO_0000053 ?memberRole .
-     
+     ?memberRole a core:MemberRole .
-     {
+     ?memberRole core:roleContributesTo ?endeavor .
-       {?memberRole core:roleRealizedIn ?endeavor }
-          union
-       {?memberRole core:roleContributesTo ?endeavor }
-     }
-           
      ?endeavor ?property ?object .
 }

productMods/WEB-INF/rich-export/outreach/outreachRoleIn.sparql

@@ -1,15 +1,11 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
      ?endeavor ?property ?object .
 } WHERE {
-     PERSON_URI core:hasOutreachProviderRole ?outreachRole .
+     PERSON_URI obo:RO_0000053 ?outreachRole .
-     
+     ?outreachRole a core:OutreachProviderRole .
-     {
+     ?outreachRole core:roleContributesTo ?endeavor .
-       { ?memberRole core:roleRealizedIn ?endeavor }
-          union
-       { ?memberRole core:roleContributesTo ?endeavor }
-     }
-     
      ?endeavor ?property ?object .
 }

productMods/WEB-INF/rich-export/patent/assignee.sparql

@@ -5,8 +5,9 @@ PREFIX bibo: <http://purl.org/ontology/bibo/>
 CONSTRUCT {
      ?assignee ?property ?object .   
 } WHERE {
-     PERSON_URI core:authorInAuthorship ?authorship .
+     PERSON_URI core:relatedBy ?authorship .
-     ?authorship core:linkedInformationResource ?patent . 
+     ?authorship a core:Authorship .
+     ?authorship core:relates ?patent . 
      ?patent rdf:type bibo:Patent .
      ?patent core:assignee ?assignee .
      ?assignee ?property ?object .   

productMods/WEB-INF/rich-export/patent/inventors.sparql

@@ -1,13 +1,16 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
 PREFIX rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
      ?person ?property ?object .   
 } WHERE {
-     PERSON_URI core:authorInAuthorship ?authorship .
+     PERSON_URI core:relatedBy ?authorship .
-     ?authorship core:linkedInformationResource ?patent . 
+     ?authorship a core:Authorship .
+     ?authorship core:relates ?patent . 
      ?patent rdf:type bibo:Patent .
-     ?authorship core:linkedAuthor ?person .
+     ?authorship core:relates ?person .
+     ?person a foaf:Person .
      ?person ?property ?object .   
 }

productMods/WEB-INF/rich-export/patent/patent.sparql

@@ -5,8 +5,9 @@ PREFIX bibo: <http://purl.org/ontology/bibo/>
 CONSTRUCT {
      ?patent ?property ?object .
 } WHERE {
-     PERSON_URI core:authorInAuthorship ?authorship . 
+     PERSON_URI core:relatedBy ?authorship . 
-     ?authorship core:linkedInformationResource ?patent .
+     ?authorship a core:Authorship .
+     ?authorship core:relates ?patent .
      ?patent rdf:type bibo:Patent .
      ?patent ?property ?object .
 }

productMods/WEB-INF/rich-export/patent/patentFiledDate.sparql

@@ -6,8 +6,9 @@ CONSTRUCT {
      ?date ?property ?object .
      ?precision ?property2 ?object2 .
 } WHERE {
-     PERSON_URI core:authorInAuthorship ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
-     ?authorship core:linkedInformationResource ?patent .
+     ?authorship a core:Authorship .
+     ?authorship core:relates ?patent .
      ?patent rdf:type bibo:Patent .
      ?patent core:dateFiled ?date .
      ?date ?property ?object .

productMods/WEB-INF/rich-export/patent/patentIssuedDate.sparql

@@ -6,8 +6,9 @@ CONSTRUCT {
      ?date ?property ?object .
      ?precision ?property2 ?object2 .
 } WHERE {
-     PERSON_URI core:authorInAuthorship ?authorship . 
+     PERSON_URI core:relatedBy ?authorship .
-     ?authorship core:linkedInformationResource ?patent .
+     ?authorship a core:Authorship .
+     ?authorship core:relates ?patent .
      ?patent rdf:type bibo:Patent .
      ?patent core:dateIssued ?date .
      ?date ?property ?object .

productMods/WEB-INF/rich-export/position/locationForPosition.sparql

@@ -1,12 +1,16 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
      ?organization core:hasGeographicLocation ?geographicLocation .
      ?geographicLocation rdfs:label ?label .
 } WHERE {
-     PERSON_URI core:personInPosition ?position . 
+     PERSON_URI core:relatedBy ?position . 
-     ?position core:positionInOrganization ?organization .
+     ?position a core:Position .
-     ?organization core:hasGeographicLocation ?geographicLocation .
+     ?position core:relates ?organization .
+     ?organization a foaf:Organization . 
+     ?organization obo:RO_0001025 ?geographicLocation .
      ?geographicLocation rdfs:label ?label .
 }

productMods/WEB-INF/rich-export/position/organizationForPosition.sparql

@@ -1,11 +1,14 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
 
 CONSTRUCT {
      ?position core:positionInOrganization ?organization .
      ?organization rdfs:label ?label .
 } WHERE {
-     PERSON_URI core:personInPosition ?position . 
+     PERSON_URI core:relatedBy ?position . 
-     ?position core:positionInOrganization ?organization .
+     ?position a core:Position .
+     ?position core:relates ?organization .
+     ?organization a foaf:Organization . 
      ?organization rdfs:label ?label .
 }

productMods/WEB-INF/rich-export/position/subOrganizationForPosition.sparql

@@ -1,12 +1,16 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
      ?organization core:hasSubOrganization ?subOrganization .
      ?subOrganization rdfs:label ?label .
 } WHERE {
-     PERSON_URI core:personInPosition ?position . 
+     PERSON_URI core:relatedBy ?position . 
-     ?position core:positionInOrganization ?organization .
+     ?position a core:Position .
-     ?organization core:hasSubOrganization ?subOrganization .
+     ?position core:relates ?organization .
+     ?organization a foaf:Organization . 
+     ?organization obo:BFO_0000050 ?subOrganization .
      ?subOrganization rdfs:label ?label .
 }

productMods/WEB-INF/rich-export/position/superOrganizationForPosition.sparql

@@ -3,8 +3,10 @@ PREFIX core: <http://vivoweb.org/ontology/core#>
 CONSTRUCT {
      ?superOrganization ?property ?object .
 } WHERE {
-     PERSON_URI core:personInPosition ?position . 
+     PERSON_URI core:relatedBy ?position . 
-     ?position core:positionInOrganization ?organization .
+     ?position a core:Position .
-     ?organization core:subOrganizationWithin ?superOrganization .
+     ?position core:relates ?organization .
+     ?organization a foaf:Organization . 
+     ?organization obo:BFO_0000051 ?superOrganization .
      ?superOrganization ?property ?object .
 }

productMods/WEB-INF/rich-export/presentation/meetingLocation.sparql

@@ -1,16 +1,14 @@
 PREFIX vivo: <http://vivoweb.org/ontology/core#>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
 
 CONSTRUCT {
      ?location rdfs:label ?locationName .
 } WHERE {
-     PERSON_URI vivo:hasPresenterRole ?presenterRole .
+     PERSON_URI obo:RO_0000053 ?presenterRole .
-
+     ?presenterRole a core:PresenterRole .
-     {?presenterRole vivo:roleRealizedIn ?presentation}
+     ?presenterRole obo:BFO_0000054 ?presentation .
-        union
+     ?presentation obo:BFO_0000050 ?containingEvent .
-     {?presenterRole vivo:roleIn ?presentation}   
+     ?containingEvent obo:RO_0001025 ?location .
-
-     ?presentation vivo:eventWithin ?containingEvent .
-     ?containingEvent vivo:hasGeographicLocation ?location .
      ?location rdfs:label ?locationName .
 }

productMods/WEB-INF/rich-export/presentation/meetingName.sparql

@@ -4,12 +4,9 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 CONSTRUCT {
      ?containingEvent rdfs:label ?containingEventName
 } WHERE {
-     PERSON_URI vivo:hasPresenterRole ?presenterRole .
+     PERSON_URI obo:RO_0000053 ?presenterRole .
- 
+     ?presenterRole a core:PresenterRole .
-     {?presenterRole vivo:roleRealizedIn ?presentation}
+     ?presenterRole obo:BFO_0000054 ?presentation .
-        union
+     ?presentation obo:BFO_0000050 ?containingEvent .
-     {?presenterRole vivo:roleIn ?presentation}   
-
-     ?presentation vivo:eventWithin ?containingEvent .
      ?containingEvent rdfs:label ?containingEventName
 }