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

Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6

Browse source
This commit is contained in:
tworrall 2013-11-07 14:24:02 -05:00
commit f8f44bf4b3
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

2
rdf/display/everytime/PropertyConfig.n3
View file

@ -305,7 +305,7 @@ local:awardOrHonorContext a :ConfigContext ;
:hasConfiguration local:awardOrHonorConfig ; :hasConfiguration local:awardOrHonorConfig ;
:configContextFor <http://vivoweb.org/ontology/core#relatedBy> ; :configContextFor <http://vivoweb.org/ontology/core#relatedBy> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ; :qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#AwardorHonorReceipt> . :qualifiedBy <http://vivoweb.org/ontology/core#AwardReceipt> .
local:awardOrHonorConfig a :ObjectPropertyDisplayConfig ; local:awardOrHonorConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-awardOrHonor.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-awardOrHonor.xml"^^xsd:string ;