VIVO-403 safeguards against duplicate context node creation in migration

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

@@ -12,4 +12,8 @@ CONSTRUCT {
     ?advisee vivo:relatedBy ?advisingRelationship .
 } WHERE {
     ?advisee vivo:adviseeIn ?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

@@ -12,4 +12,8 @@ CONSTRUCT {
     ?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

@@ -14,5 +14,9 @@ CONSTRUCT {
     } UNION {
       ?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/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/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,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 vivo:middleName ?middleName 
+    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,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 vivo:middleName ?middleName .
+} WHERE {
+     ?s vivo:middleName ?middleName . 
+     ?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

@@ -12,12 +12,12 @@ CONSTRUCT {
     _:address v:postalCode ?addressPostalCode .
     _:address v:country ?addressCountry .
 } 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 }
+    ?s arg:ARG_2000028 ?vcard .
     OPTIONAL {
         ?address vivo:address1 ?address1 .
         ?address vivo:address2 ?address2 .
@@ -33,5 +33,8 @@ CONSTRUCT {
     OPTIONAL {
         ?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
+    }
 }

rdf/tbox/filegraph/data-properties.owl

@@ -1833,16 +1833,13 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
     </owl:DatatypeProperty>
     
 
-
     <!-- http://vivoweb.org/ontology/core#overview -->
 
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#overview">
         <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty"/>
-        <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
     </owl:DatatypeProperty>
     
 
-
     <!-- http://vivoweb.org/ontology/core#patentNumber -->
 
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#patentNumber">