From 2de7bab3b2ca7968194e7629700900a180347e72 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Mon, 4 Nov 2013 15:17:10 -0500 Subject: [PATCH 1/2] VIVO-391 permitting migration of standalone advisee and advising relationship --- ...singRelationship.sparql => AdviseeRole.sparql} | 8 -------- .../sparqlConstructs/additions/AdvisorRole.sparql | 15 +++++++++++++++ .../deletions/AdvisingRelationshipDel.sparql | 6 ------ .../deletions/AdvisingRelationshipDel2.sparql | 13 +++++++++++++ 4 files changed, 28 insertions(+), 14 deletions(-) rename productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/{AdvisingRelationship.sparql => AdviseeRole.sparql} (57%) create mode 100644 productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdvisorRole.sparql create mode 100644 productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdvisingRelationship.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdviseeRole.sparql similarity index 57% rename from productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdvisingRelationship.sparql rename to productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdviseeRole.sparql index 71d12749..799823c3 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdvisingRelationship.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdviseeRole.sparql @@ -6,18 +6,10 @@ CONSTRUCT { ?advisee _:AdviseeRole . _:AdviseeRole ?advisee . _:AdviseeRole a vivo:AdviseeRole . - ?advisor _:AdvisorRole . - _:AdvisorRole ?advisor . - _:AdvisorRole a vivo:AdvisorRole . _:AdviseeRole vivo:relatedBy ?advisingRelationship . ?advisingRelationship vivo:relates _:AdviseeRole . - _:AdvisorRole vivo:relatedBy ?advisingRelationship . - ?advisingRelationship vivo:relates _:AdvisorRole . ?advisingRelationship vivo:relates ?advisee . - ?advisingRelationship vivo:relates ?advisor . ?advisee vivo:relatedBy ?advisingRelationship . - ?advisor vivo:relatedBy ?advisingRelationship . } WHERE { ?advisee vivo:adviseeIn ?advisingRelationship . - ?advisor vivo:advisorIn ?advisingRelationship . } diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdvisorRole.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdvisorRole.sparql new file mode 100644 index 00000000..685a93e1 --- /dev/null +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/AdvisorRole.sparql @@ -0,0 +1,15 @@ +PREFIX vivo: +PREFIX owl: +PREFIX foaf: + +CONSTRUCT { + ?advisor _:AdvisorRole . + _:AdvisorRole ?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 . +} diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql index 5a47e087..3bb114bd 100644 --- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/AdvisingRelationshipDel.sparql @@ -3,15 +3,9 @@ PREFIX owl: PREFIX foaf: CONSTRUCT { - ?advisee vivo:adviseeIn ?advisingRelationship . - ?advisingRelationship vivo:advisee ?advisee . ?advisor vivo:advisorIn ?advisingRelationship . ?advisingRelationship vivo:advisor ?advisor } WHERE { - ?advisee vivo:adviseeIn ?advisingRelationship . - OPTIONAL { - ?advisingRelationship vivo:advisee ?advisee . - } ?advisor vivo:advisorIn ?advisingRelationship . OPTIONAL { ?advisingRelationship vivo:advisor ?advisor diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql new file mode 100644 index 00000000..6ef6c59e --- /dev/null +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/AdvisingRelationshipDel2.sparql @@ -0,0 +1,13 @@ +PREFIX vivo: +PREFIX owl: +PREFIX foaf: + +CONSTRUCT { + ?advisee vivo:adviseeIn ?advisingRelationship . + ?advisingRelationship vivo:advisee ?advisee . +} WHERE { + ?advisee vivo:adviseeIn ?advisingRelationship . + OPTIONAL { + ?advisingRelationship vivo:advisee ?advisee . + } +} From b435a487bf16c528c4fbb03f997aca04775fcc17 Mon Sep 17 00:00:00 2001 From: j2blake Date: Mon, 4 Nov 2013 16:57:05 -0500 Subject: [PATCH 2/2] VIVO-473 Fix "short views" test case to work with ISF --- .../suites/ShortViews/shortview_config.n3 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 b/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 index 37e20113..1c0a1866 100644 --- a/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 +++ b/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 @@ -52,9 +52,10 @@ mydomain:facultyDepartmentDG display:query """ PREFIX rdfs: PREFIX vivo: +PREFIX 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: -PREFIX vivo: +PREFIX 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: +PREFIX obo: PREFIX vivo: SELECT ?label WHERE { ?individualUri vivo:contributingRole ?role . -?role vivo:leaderRoleOf ?head . +?role obo:RO_0000052 ?head . ?head rdfs:label ?label . } LIMIT 1