From bd74865d436eea2aca8b3f194a6ae6e9d48e142d Mon Sep 17 00:00:00 2001
From: brianjlowe <bjl23@cornell.edu>
Date: Wed, 16 Oct 2013 16:42:45 -0400
Subject: [PATCH] fixing duplicated awarded degrees in migration

---
 .../additions/post/awardedDegree.sparql           |  8 +-------
 .../additions/post/contributingAdvising.sparql    | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/contributingAdvising.sparql

diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/awardedDegree.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/awardedDegree.sparql
index 5a546c99..8d90cd6d 100644
--- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/awardedDegree.sparql
+++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/awardedDegree.sparql
@@ -12,10 +12,9 @@ CONSTRUCT {
     ?person vivo:relatedBy _:awardedDegree .
     _:awardedDegree vivo:assignedBy ?org .
     ?org vivo:assigns _:awardedDegree .
-    ?educationalProcess <http://purl.obolibrary.org/obo/BFO_0000055> ?role .
-    ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?educationalProcess .
 } WHERE {
     ?person <http://purl.obolibrary.org/obo/RO_0000056> ?educationalProcess .
+    ?person a foaf:Person .
     ?educationalProcess a vivo:EducationalProcess .
     ?educationalProcess <http://purl.obolibrary.org/obo/RO_0002234> ?degree .
     ?degree a vivo:AcademicDegree .
@@ -23,9 +22,4 @@ CONSTRUCT {
         ?educationalProcess <http://purl.obolibrary.org/obo/RO_0000057> ?org . 
         ?org a foaf:Organization 
     }
-    OPTIONAL {
-        ?educationalProcess vivo:contributingAdvising ?advising .
-        ?advising vivo:relates ?role .
-        ?role a <http://purl.obolibrary.org/obo/BFO_0000023> .
-    }
 }
diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/contributingAdvising.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/contributingAdvising.sparql
new file mode 100644
index 00000000..a80f3c79
--- /dev/null
+++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/contributingAdvising.sparql
@@ -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 {
+    ?educationalProcess <http://purl.obolibrary.org/obo/BFO_0000055> ?role .
+    ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?educationalProcess .
+} WHERE {
+    ?person <http://purl.obolibrary.org/obo/RO_0000056> ?educationalProcess .
+    ?person a foaf:Person .
+    ?educationalProcess a vivo:EducationalProcess .
+    ?educationalProcess vivo:contributingAdvising ?advising .
+    ?advising vivo:relates ?role .
+    ?role a <http://purl.obolibrary.org/obo/BFO_0000023> .
+}