litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-12-12 13:41:54 -05:00
commit b0e6f9ff98
3 changed files with 262 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/example.runtime.properties
View file

@ -230,7 +230,7 @@ proxy.eligibleTypeList = http://xmlns.com/foaf/0.1/Person, http://xmlns.com/foaf
# installation to develop a web service that captures images of web pages or to use an existing # installation to develop a web service that captures images of web pages or to use an existing
# service outside of VIVO. For more information on implementing multiple profile pages, refer to # service outside of VIVO. For more information on implementing multiple profile pages, refer to
# this wiki page: https://wiki.duraspace.org/display/VIVO/Multiple+foaf%3APerson+Profile+Pages. # this wiki page: https://wiki.duraspace.org/display/VIVO/Multiple+foaf%3APerson+Profile+Pages.
#MultiViews.profilePageTypes=enabled #multiViews.profilePageTypes=enabled
# Geo Focus Maps # Geo Focus Maps
# When the following flag is set to enabled, the VIVO home page displays a global map highlighting the # When the following flag is set to enabled, the VIVO home page displays a global map highlighting the

7
rdf/tbox/filegraph/research-resource.owl
View file

@ -55,6 +55,13 @@
<owl:someValuesFrom rdf:resource="http://purl.obolibrary.org/obo/OBI_0000094"/> <owl:someValuesFrom rdf:resource="http://purl.obolibrary.org/obo/OBI_0000094"/>
</owl:Restriction> </owl:Restriction>
</rdfs:subClassOf> </rdfs:subClassOf>
<!-- added for VIVO -->
<rdfs:subClassOf>
<owl:Restriction>
<owl:onProperty rdf:resource="http://purl.obolibrary.org/obo/ERO_0000543"/>
<owl:allValuesFrom rdf:resource="http://purl.obolibrary.org/obo/ERO_0000007"/> <!-- Technique -->
</owl:Restriction>
</rdfs:subClassOf>
<obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A flow cytometer.</obo:IAO_0000112> <obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">A flow cytometer.</obo:IAO_0000112>
<obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Material entity that is designed to have a function and play a role in scientific investigation.</obo:IAO_0000115> <obo:IAO_0000115 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Material entity that is designed to have a function and play a role in scientific investigation.</obo:IAO_0000115>
<obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Melissa Haendel</obo:IAO_0000117> <obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Melissa Haendel</obo:IAO_0000117>

18
rdf/tbox/firsttime/initialTBoxAnnotations.n3
View file

@ -523,7 +523,8 @@ vivo:relates
rdfs:label "relates"@en-US . rdfs:label "relates"@en-US .
obo:ERO_0000007 obo:ERO_0000007
rdfs:label "Technique"@en-US . rdfs:label "Technique"@en-US ;
vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouppublications> .
vcard:hasCalendarLink vcard:hasCalendarLink
rdfs:label "has calendar link"@en-US . rdfs:label "has calendar link"@en-US .
@ -536,7 +537,8 @@ vivo:SubnationalRegion
vitro:displayLimitAnnot vitro:displayLimitAnnot
"-1"^^xsd:int ; "-1"^^xsd:int ;
vitro:displayRankAnnot vitro:displayRankAnnot
"-1"^^xsd:int ; "10"^^xsd:int ;
vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouplocations> ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
@ -2452,7 +2454,15 @@ obo:ARG_2000083
rdfs:label "American Board of Plastic Surgery"@en-US . rdfs:label "American Board of Plastic Surgery"@en-US .
obo:ERO_0000398 obo:ERO_0000398
rdfs:label "is performed by"@en-US . rdfs:label "is performed by"@en-US ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .
vcard:hasCalenderBusy vcard:hasCalenderBusy
rdfs:label "has calendar busy"@en-US . rdfs:label "has calendar busy"@en-US .
@ -4445,6 +4455,8 @@ geo:nameShortAR
"5"^^xsd:int ; "5"^^xsd:int ;
vitro:displayRankAnnot vitro:displayRankAnnot
"5"^^xsd:int ; "5"^^xsd:int ;
vitro:inClassGroup
<http://vivoweb.org/ontology#vitroClassGrouppublications> ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot