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

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

@@ -9,7 +9,15 @@ CONSTRUCT {
     _:vcard arg:ARG_2000029 ?s .
     _:vcard a v:Kind .
 } WHERE {
-    ?s vivo:webpage ?webpage 
+    ?s a owl:Thing
-    FILTER NOT EXISTS { ?s a foaf:Agent } 
+    FILTER ( 
-    FILTER NOT EXISTS { ?s arg:ARG_2000028 ?existingvcard } 
+        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 } 
+    ) 
+    FILTER NOT EXISTS { ?s arg:ARG_2000028 ?vcardNode }
 }

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

@@ -4,15 +4,15 @@ PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
 PREFIX vivo: <http://vivoweb.org/ontology/core#> 
 
 CONSTRUCT {
-    ?vcard v:hasAddress _:address .
+    ?vcard v:hasAddress ?address .
-    _:address a v:Address .
+    ?address a v:Address .
-    _:address v:streetAddress ?streetAddress .
+    ?address v:streetAddress ?streetAddress .
-    _:address v:locality ?addressCity .
+    ?address v:locality ?addressCity .
-    _:address v:region ?addressState .
+    ?address v:region ?addressState .
-    _:address v:postalCode ?addressPostalCode .
+    ?address v:postalCode ?addressPostalCode .
-    _:address v:country ?addressCountry .
+    ?address v:country ?addressCountry .
-    _:address <http://purl.obolibrary.org/obo/RO_0001025> ?location .
+    ?address <http://purl.obolibrary.org/obo/RO_0001025> ?location .
-    ?location <http://purl.obolibrary.org/obo/RO_0001015> _:address .
+    ?location <http://purl.obolibrary.org/obo/RO_0001015> ?address .
 } WHERE {
     ?s vivo:mailingAddress ?address .
     OPTIONAL { ?address vivo:addressCity ?addressCity }

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

@@ -5,10 +5,10 @@ PREFIX v:   <http://www.w3.org/2006/vcard/ns#>
 PREFIX vivo: <http://vivoweb.org/ontology/core#> 
 
 CONSTRUCT {
-    ?vcard v:hasURL _:url .
+    ?vcard v:hasURL ?webpage .
-   _:url a v:URL .
+    ?webpage a v:URL .
-   _:url v:url ?linkURI .
+    ?webpage v:url ?linkURI .
-   _:url rdfs:label ?linkAnchorText
+    ?webpage rdfs:label ?linkAnchorText
 } WHERE {
     ?s vivo:webpage ?webpage .
     ?webpage vivo:linkURI ?linkURI .
@@ -16,7 +16,4 @@ CONSTRUCT {
     OPTIONAL {
         ?webpage vivo:linkAnchorText ?linkAnchorText
     }
-    FILTER NOT EXISTS {
-        ?vcard v:hasURL ?URLNode
-    }
 }

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

@@ -16,10 +16,22 @@ CONSTRUCT {
         ?s vivo:primaryPhoneNumber ?primaryPhoneNumber .
         ?s vivo:faxNumber ?faxNumber .
         ?s vivo:mailingAddress ?address .
-        ?address ?addressP ?addressO .
+        ?address vivo:mailingAddressFor ?s .
-        ?addressS ?addressQ ?address .
+        ?address a ?addressType .
+        ?address vivo:address1 ?address1 .
+        ?address vivo:address2 ?address2 .
+        ?address vivo:address3 ?address3 .
+        ?address vivo:addressCity ?city .
+        ?address vivo:addressState ?state .
+        ?address vivo:addressPostalCode ?postalCode .
+        ?address vivo:addressCountry ?country .
+        ?address vivo:hasGeographicLocation ?location .
+        ?location vivo:geographicLocationOf ?address .
         ?s vivo:webpage ?webpage .
-        ?webpage ?webpageP ?webpageO .
+        ?webpage vivo:webpageOf ?s .
+        ?webpage vivo:linkAnchorText ?linkAnchorText .
+        ?webpage vivo:linkURI ?linkURI .
+        ?webpage a vivo:URLLink .
 } WHERE {
     {
         ?s foaf:firstName ?firstName .
@@ -55,19 +67,65 @@ CONSTRUCT {
     UNION {
         ?s vivo:mailingAddress ?address .
     }
+    UNION {
+        ?address vivo:mailingAddressFor ?s .
+    }
     UNION {
         ?s vivo:mailingAddress ?address .
-        ?address ?addressP ?addressO
+        ?address a ?addressType 
+        FILTER(regex(str(?addressType),"vivoweb.org/ontology/core"))
+    }
+    UNION {
+        ?s vivo:mailingAddress ?address .
+        ?address vivo:address1 ?address1 .
     } 
     UNION {
         ?s vivo:mailingAddress ?address .
-        ?addressS ?addressQ ?address 
+        ?address vivo:address2 ?address2 .
-    }
+    } 
+    UNION {
+        ?s vivo:mailingAddress ?address .
+        ?address vivo:address3 ?address3 .
+    } 
+    UNION {
+        ?s vivo:mailingAddress ?address .
+        ?address vivo:addressCity ?city .
+    } 
+    UNION {
+        ?s vivo:mailingAddress ?address .
+        ?address vivo:addressState ?state .
+    } 
+    UNION {
+        ?s vivo:mailingAddress ?address .
+        ?address vivo:addressPostalCode ?postalCode .
+    } 
+    UNION {
+        ?s vivo:mailingAddress ?address .
+        ?address vivo:addressCountry ?country .
+    } 
+    UNION {
+        ?s vivo:mailingAddress ?address .
+        ?address vivo:hasGeographicLocation ?location .
+    } 
+    UNION {
+        ?s vivo:mailingAddress ?address .
+        ?location vivo:geographicLocationOf ?address .
+    } 
     UNION {
         ?s vivo:webpage ?webpage 
     }
+    UNION {
+        ?webpage vivo:webpageOf ?s
+    }
+    UNION {
+        ?s vivo:webpage ?webpage 
+    } 
     UNION {
         ?s vivo:webpage ?webpage .
-        ?webpage ?webpageP ?webpageO
+        ?webpage vivo:linkURI ?linkURI 
+    } 
+    UNION {
+        ?s vivo:webpage ?webpage .
+        ?webpage vivo:linkAnchorText ?linkAnchorText 
     }
 }

rdf/display/everytime/vivoListViewConfig.rdf

@@ -43,18 +43,10 @@
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile>
     </rdf:Description>
 
-    <rdf:Description rdf:about="http://vivoweb.org/ontology/core#dateTime">
-        <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile>
-    </rdf:Description>
-
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#expirationDate">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile>
     </rdf:Description>
 
-    <rdf:Description rdf:about="http://purl.org/spar/c4o/hasGlobalCountDate">
-        <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile>
-    </rdf:Description>
-
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#start">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile>
     </rdf:Description>

rdf/tbox/filegraph/data-properties.owl

@@ -1621,6 +1621,17 @@ modern society using the world of Star trek. Los Angeles Times, March
     
 
 
+    <!-- http://purl.org/spar/c4o/hasGlobalCountDate -->
+
+    <owl:DatatypeProperty rdf:about="http://purl.org/spar/c4o/hasGlobalCountDate">
+
+        <rdfs:domain rdf:resource="http://purl.org/spar/c4o/GlobalCitationCount"/>
+        <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
+        <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The date on which the global citation count of the cited entity was recorded from a named bibliographic information source.</obo:IAO_0000115>
+    </owl:DatatypeProperty>
+
+
+
     <!-- http://purl.org/spar/c4o/hasGlobalCountValue -->
 
     <owl:DatatypeProperty rdf:about="http://purl.org/spar/c4o/hasGlobalCountValue">
@@ -1659,6 +1670,15 @@ modern society using the world of Star trek. Los Angeles Times, March
     
 
 
+    <!-- http://vivoweb.org/ontology/core#dateTime -->
+
+    <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#dateTime">
+
+        <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#dateTime"/>
+    </owl:DatatypeProperty>
+
+
+
     <!-- http://vivoweb.org/ontology/core#eRACommonsId -->
 
     <owl:DatatypeProperty rdf:about="http://vivoweb.org/ontology/core#eRACommonsId">

rdf/tbox/filegraph/object-properties.owl

@@ -1264,15 +1264,6 @@ there is a measurement process p that has specified output m, a measurement datu
     </owl:ObjectProperty>
     
 
-    <!-- http://vivoweb.org/ontology/core#dateTime -->
-
-    <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#dateTime">
-
-        <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#DateTimeValue"/>
-        <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#dateTimeValue"/>
-    </owl:ObjectProperty>
-    
-
 
     <!-- http://vivoweb.org/ontology/core#dateFiled -->
 
@@ -1285,18 +1276,6 @@ there is a measurement process p that has specified output m, a measurement datu
     
 
 
-    <!-- http://purl.org/spar/c4o/hasGlobalCountDate -->
-
-    <owl:ObjectProperty rdf:about="http://purl.org/spar/c4o/hasGlobalCountDate">
-
-        <rdfs:domain rdf:resource="http://purl.org/spar/c4o/GlobalCitationCount"/>
-        <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#DateTimeValue"/>
-        <rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#dateTimeValue"/>
-        <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">The date on which the global citation count of the cited entity was recorded from a named bibliographic information source.</obo:IAO_0000115>
-    </owl:ObjectProperty>
-    
-
-
     <!-- http://vivoweb.org/ontology/core#dateIssued -->
 
     <owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#dateIssued">