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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdvisingRelationship.sparql → productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdviseeRole.sparql
View file

@ -6,18 +6,10 @@ CONSTRUCT {
?advisee <http://purl.obolibrary.org/obo/RO_0000053> _:AdviseeRole . ?advisee <http://purl.obolibrary.org/obo/RO_0000053> _:AdviseeRole .
_:AdviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisee . _:AdviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisee .
_:AdviseeRole a vivo:AdviseeRole . _:AdviseeRole a vivo:AdviseeRole .
?advisor <http://purl.obolibrary.org/obo/RO_0000053> _:AdvisorRole .
_:AdvisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisor .
_:AdvisorRole a vivo:AdvisorRole .
_:AdviseeRole vivo:relatedBy ?advisingRelationship . _:AdviseeRole vivo:relatedBy ?advisingRelationship .
?advisingRelationship vivo:relates _:AdviseeRole . ?advisingRelationship vivo:relates _:AdviseeRole .
_:AdvisorRole vivo:relatedBy ?advisingRelationship .
?advisingRelationship vivo:relates _:AdvisorRole .
?advisingRelationship vivo:relates ?advisee . ?advisingRelationship vivo:relates ?advisee .
?advisingRelationship vivo:relates ?advisor .
?advisee vivo:relatedBy ?advisingRelationship . ?advisee vivo:relatedBy ?advisingRelationship .
?advisor vivo:relatedBy ?advisingRelationship .
} WHERE { } WHERE {
?advisee vivo:adviseeIn ?advisingRelationship . ?advisee vivo:adviseeIn ?advisingRelationship .
?advisor vivo:advisorIn ?advisingRelationship .
} }

15
productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdvisorRole.sparql Normal file
View file

@ -0,0 +1,15 @@
PREFIX vivo: <http://vivoweb.org/ontology/core#>
PREFIX owl: <http://www.w3.org/2002/07/owl#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
CONSTRUCT {
?advisor <http://purl.obolibrary.org/obo/RO_0000053> _:AdvisorRole .
_:AdvisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisor .
_:AdvisorRole a vivo:AdvisorRole .
_:AdvisorRole vivo:relatedBy ?advisingRelationship .
?advisingRelationship vivo:relates _:AdvisorRole .
?advisingRelationship vivo:relates ?advisor .
?advisor vivo:relatedBy ?advisingRelationship .
} WHERE {
?advisor vivo:advisorIn ?advisingRelationship .
}

6
productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql
View file

@ -3,15 +3,9 @@ PREFIX owl: <http://www.w3.org/2002/07/owl#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX foaf: <http://xmlns.com/foaf/0.1/>
CONSTRUCT { CONSTRUCT {
?advisee vivo:adviseeIn ?advisingRelationship .
?advisingRelationship vivo:advisee ?advisee .
?advisor vivo:advisorIn ?advisingRelationship . ?advisor vivo:advisorIn ?advisingRelationship .
?advisingRelationship vivo:advisor ?advisor ?advisingRelationship vivo:advisor ?advisor
} WHERE { } WHERE {
?advisee vivo:adviseeIn ?advisingRelationship .
OPTIONAL {
?advisingRelationship vivo:advisee ?advisee .
}
?advisor vivo:advisorIn ?advisingRelationship . ?advisor vivo:advisorIn ?advisingRelationship .
OPTIONAL { OPTIONAL {
?advisingRelationship vivo:advisor ?advisor ?advisingRelationship vivo:advisor ?advisor

13
productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql Normal file
View file

@ -0,0 +1,13 @@
PREFIX vivo: <http://vivoweb.org/ontology/core#>
PREFIX owl: <http://www.w3.org/2002/07/owl#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
CONSTRUCT {
?advisee vivo:adviseeIn ?advisingRelationship .
?advisingRelationship vivo:advisee ?advisee .
} WHERE {
?advisee vivo:adviseeIn ?advisingRelationship .
OPTIONAL {
?advisingRelationship vivo:advisee ?advisee .
}
}

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

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