From 2474be90721ea085e96cce09ef3a1ddba458a9b0 Mon Sep 17 00:00:00 2001
From: brianjlowe <bjl23@cornell.edu>
Date: Tue, 19 Nov 2013 16:08:46 -0500
Subject: [PATCH] VIVO-550 and VIVO-551 migration improvements

---
 .../sparqlConstructs/additions/grant-pre.sparql    |  2 +-
 .../sparqlConstructs/additions/post/Grant.sparql   |  2 +-
 .../additions/post/awardConferred.sparql           | 14 ++++++++++++++
 .../deletions/grant-pre-del.sparql                 |  2 +-
 .../deletions/post/awardConferredDel.sparql        | 12 ++++++++++++
 5 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/awardConferred.sparql
 create mode 100644 productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/post/awardConferredDel.sparql

diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/grant-pre.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/grant-pre.sparql
index 1fd35445..99c631b6 100644
--- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/grant-pre.sparql
+++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/grant-pre.sparql
@@ -7,5 +7,5 @@ CONSTRUCT {
     ?grant vivo:relates ?role    
 } WHERE {
     ?role vivo:roleContributesTo ?grant .
-    ?grant a vivo:Grant .
+    { ?grant a vivo:Grant } UNION { ?grant a vivo:Contract }
 }
diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/Grant.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/Grant.sparql
index f778da76..0277868c 100644
--- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/Grant.sparql
+++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/Grant.sparql
@@ -8,6 +8,6 @@ CONSTRUCT {
 } WHERE {
     ?agent <http://purl.obolibrary.org/obo/RO_0000053> ?role .
     ?role vivo:relatedBy ?grant .
-    ?grant a vivo:Grant .
+    { ?grant a vivo:Grant } UNION { ?grant a vivo:Contract }
     FILTER NOT EXISTS { ?grant vivo:relates ?agent } 
 }
diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/awardConferred.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/awardConferred.sparql
new file mode 100644
index 00000000..971b713f
--- /dev/null
+++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/post/awardConferred.sparql
@@ -0,0 +1,14 @@
+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 {
+    ?awardReceipt vivo:assignedBy ?org .
+    ?org vivo:assigns ?awardReceipt .
+} WHERE {
+    ?org vivo:assigns ?award .
+    ?award a vivo:Award .
+    ?org a foaf:Organization .
+    ?awardReceipt vivo:relates ?award .
+    ?awardReceipt a vivo:AwardReceipt .
+}
diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/grant-pre-del.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/grant-pre-del.sparql
index a99d35e7..f35cb8bd 100644
--- a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/grant-pre-del.sparql
+++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/grant-pre-del.sparql
@@ -7,5 +7,5 @@ CONSTRUCT {
     ?grant vivo:contributingRole ?role .
 } WHERE {
     ?role vivo:roleContributesTo ?grant .
-    ?grant a vivo:Grant .
+    { ?grant a vivo:Grant } UNION { ?grant a vivo:Contract }
 }
diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/post/awardConferredDel.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/post/awardConferredDel.sparql
new file mode 100644
index 00000000..f3dd1a5a
--- /dev/null
+++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/deletions/post/awardConferredDel.sparql
@@ -0,0 +1,12 @@
+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 {
+    ?award vivo:assignedBy ?org .
+    ?org vivo:assigns ?award .
+} WHERE {
+    ?org vivo:assigns ?award .
+    ?award a vivo:Award .
+    ?org a foaf:Organization .
+}