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:
j2blake 2013-11-04 16:57:33 -05:00
commit 76bc1b41f0
5 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
utilities/acceptance-tests/suites/ShortViews/shortview_config.n3
View file

@ -52,9 +52,10 @@ mydomain:facultyDepartmentDG
display:query """
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX vivo: <http://vivoweb.org/ontology/core#>
PREFIX obo: <http://purl.obolibrary.org/obo/>
SELECT ?deptName
WHERE {
?individualUri vivo:hasMemberRole ?membership .
?individualUri obo:RO_0000053 ?membership .
?membership vivo:roleContributesTo ?deptUri .
?deptUri
a vivo:AcademicDepartment ;
@ -98,11 +99,11 @@ mydomain:departmentLocationDG
display:saveToVar "locations" ;
display:query """
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX vivo: <http://vivoweb.org/ontology/core#>
PREFIX obo: <http://purl.obolibrary.org/obo/>
SELECT ?label
WHERE
{
?location vivo:geographicLocationOf ?individualUri ;
?location obo:RO_0001015 ?individualUri ;
rdfs:label ?label .
}
LIMIT 20
@ -113,12 +114,13 @@ mydomain:departmentHeadDG
display:saveToVar "deptHead" ;
display:query """
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX obo: <http://purl.obolibrary.org/obo/>
PREFIX vivo: <http://vivoweb.org/ontology/core#>
SELECT ?label
WHERE
{
?individualUri vivo:contributingRole ?role .
?role vivo:leaderRoleOf ?head .
?role obo:RO_0000052 ?head .
?head rdfs:label ?label .
}
LIMIT 1