Merge branch 'dev-isf' of https://github.com/vivo-project/VIVO into dev-isf

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

@@ -0,0 +1,11 @@
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX owl: <http://www.w3.org/2002/07/owl#Thing> 
+
+CONSTRUCT {
+    ?s vivo:orcidId ?orcidURI .
+    ?orcidURI a owl:Thing .
+} WHERE {
+    ?s vivo:orcidId ?orcidString 
+    FILTER(isLiteral(?orcidString))
+    BIND(IRI(concat("http://orcid.org/", str(?orcidString))) AS ?orcidURI)
+}

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

@@ -9,12 +9,6 @@ CONSTRUCT {
     _:primaryTelephone a v:Voice .
     _:primaryTelephone a v:Work .
     _:primaryTelephone v:telephone ?primaryPhoneNumber .
-    _:name v:hasTelephone _:fax .
-    _:fax a v:Telephone .
-    _:fax a v:Fax.
-    _:fax v:telephone ?faxNumber . 
-    _:name v:hasAddress _:address .
-    _:address v:streetAddress ?streetAddress .
 } WHERE {
     ?s arg:ARG_2000028 ?vcard .
     ?s vivo:primaryPhoneNumber ?primaryPhoneNumber

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

@@ -8,8 +8,6 @@ CONSTRUCT {
     _:fax a v:Telephone .
     _:fax a v:Fax.
     _:fax v:telephone ?faxNumber . 
-    _:name v:hasAddress _:address .
-    _:address v:streetAddress ?streetAddress .
 } WHERE {
     ?s arg:ARG_2000028 ?vcard .
     ?s vivo:faxNumber ?faxNumber

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

@@ -0,0 +1,9 @@
+PREFIX vivo: <http://vivoweb.org/ontology/core#> 
+PREFIX owl: <http://www.w3.org/2002/07/owl#Thing> 
+
+CONSTRUCT {
+    ?s vivo:orcidId ?orcidString .
+} WHERE {
+    ?s vivo:orcidId ?orcidString 
+    FILTER(isLiteral(?orcidString))
+}

rdf/tbox/filegraph/appControls-temp.n3

@@ -59,4 +59,9 @@ foaf:Person
               [ a       owl:Restriction ;
                 owl:someValuesFrom <http://www.w3.org/2006/vcard/ns#Individual> ;
                 owl:onProperty <http://purl.obolibrary.org/obo/ARG_2000028>
+              ] ;
+      rdfs:subClassOf
+              [ a       owl:Restriction ;
+                owl:onProperty <http://vivoweb.org/ontology/core#hasResearchArea> ;
+                owl:allValuesFrom <http://www.w3.org/2004/02/skos/core#Concept> 
               ] .

rdf/tbox/filegraph/data-properties.owl

@@ -1830,19 +1830,6 @@ use one freetextKeyword assertion for each keyword or phrase.</obo:IAO_0000112>
     
 
 
-    <!-- http://vivoweb.org/ontology/core#orcidId -->
-
-    <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#orcidId">
-        <rdfs:label xml:lang="en">orcid id</rdfs:label>
-        <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">We can&apos;t yet assume that we will only have a single ORCID id for a person.
-source: http://en.wikipedia.org/wiki/ORCID .
-
-
-We wanted this property to be visible so that people would be aware that we intend to carry ORCID ids in VIVO for cross-reference. I don&apos;t believe any ORCID ids have been minted yet, but it&apos;s hard to imagine they would need to be private since the goal of having them is to disambiguate author references internationally. However, this and the researcherId and scopusId (also with domain foaf:Person) can stay as visible to self-editors for now as they will probably be used mostly in data ingest. It might be nice in the future to let people make their own decision about whether these are visible.</obo:IAO_0000112>
-        <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#identifier"/>
-    </owl:DatatypeProperty>
-    
-
 
     <!-- http://vivoweb.org/ontology/core#outreachOverview -->
 

rdf/tbox/filegraph/object-properties.owl

@@ -2068,6 +2068,47 @@ there is a measurement process p that has specified output m, a measurement datu
         <rdfs:range rdf:resource="http://www.w3.org/2006/vcard/ns#URL"/>
     </owl:ObjectProperty>
     
+<!-- VIVO modifications from first ISF release -->
+
+    <!-- http://vivoweb.org/ontology/core#orcidId -->
+
+    <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#orcidId">
+        <rdfs:label xml:lang="en">orcid id</rdfs:label>
+        <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">This is now an object property where the object value is a resource of the form &lt;http://orcid.org/NNNN-NNNN-NNNN-NNNN&gt;.  This is to support connecting VIVO and ORCID in the linked data web.   Note: a person can have multiple ORCID iDs.</obo:IAO_0000112>
+    </owl:ObjectProperty>
+
+
+
+    <!-- http://vivoweb.org/ontology/core#roleContributesTo -->
+
+    <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#roleContributesTo">
+        <rdfs:label xml:lang="en-us">contributes to</rdfs:label>
+        <rdfs:domain rdf:resource="http://purl.obolibrary.org/obo/BFO_0000023"/>
+        <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#contributingRole"/>
+    </owl:ObjectProperty>
+
+    <!-- http://vivoweb.org/ontology/core#contributingRole -->
+
+    <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#contributingRole">
+        <rdfs:label xml:lang="en-us">contributor</rdfs:label>
+        <rdfs:range rdf:resource="http://purl.obolibrary.org/obo/BFO_0000023"/>
+        <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#roleContributesTo"/>
+    </owl:ObjectProperty> 
+
+    <!-- http://vivoweb.org/ontology/core#hasResearchArea -->
+
+    <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#hasResearchArea">
+        <rdfs:label xml:lang="en-us">research areas</rdfs:label>
+        <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#hasAssociatedConcept"/>
+        <owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#researchAreaOf"/>
+    </owl:ObjectProperty>
+
+     <!-- http://vivoweb.org/ontology/core#researchAreaOf -->
+
+    <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#researchAreaOf">
+        <rdfs:label xml:lang="en-us">research area of</rdfs:label>
+        <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#conceptAssociatedWith"/>
+    </owl:ObjectProperty>
 
 
 <!-- Generated by the OWL API (version 3.3.1957) http://owlapi.sourceforge.net -->