From dd24baad8bf8f9365dcd6e895c48707c51d3936e Mon Sep 17 00:00:00 2001
From: brianjlowe <bjl23@cornell.edu>
Date: Mon, 2 Dec 2013 15:43:39 -0500
Subject: [PATCH] VIVO-596 adding Grant properties to Contract

---
 rdf/tbox/filegraph/classes-additional.owl | 30 +++++++++++++++++++
 rdf/tbox/filegraph/dataDomains.rdf        | 36 ++++++++++++++++++++---
 rdf/tbox/filegraph/objectRanges.rdf       |  9 +++++-
 3 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/rdf/tbox/filegraph/classes-additional.owl b/rdf/tbox/filegraph/classes-additional.owl
index d79fbefa..c22a4c8b 100644
--- a/rdf/tbox/filegraph/classes-additional.owl
+++ b/rdf/tbox/filegraph/classes-additional.owl
@@ -902,7 +902,37 @@
         </rdfs:subClassOf>
     </owl:Class>
     
+    
 
+    <!-- http://vivoweb.org/ontology/core#Contract -->
+
+    <owl:Class rdf:about="http://vivoweb.org/ontology/core#Contract">
+
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="http://vivoweb.org/ontology/core#supportedInformationResource"/>
+                <owl:allValuesFrom rdf:resource="http://purl.obolibrary.org/obo/IAO_0000030"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="http://purl.org/ontology/bibo/abstract"/>
+                <owl:allValuesFrom rdf:resource="http://www.w3.org/2000/01/rdf-schema#Literal"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="http://vivoweb.org/ontology/core#assignedBy"/>
+                <owl:allValuesFrom rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="http://vivoweb.org/ontology/core#dateTimeInterval"/>
+                <owl:allValuesFrom rdf:resource="http://vivoweb.org/ontology/core#DateTimeInterval"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+    </owl:Class>
 
     <!-- http://purl.obolibrary.org/obo/IAO_0000030 -->
 
diff --git a/rdf/tbox/filegraph/dataDomains.rdf b/rdf/tbox/filegraph/dataDomains.rdf
index 3ad46a2b..9526dba1 100644
--- a/rdf/tbox/filegraph/dataDomains.rdf
+++ b/rdf/tbox/filegraph/dataDomains.rdf
@@ -33,7 +33,14 @@
     <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Article"/>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#localAwardId">
-    <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Grant"/>
+    <rdfs:domain>
+      <owl:Class>
+        <owl:unionOf rdf:parseType="Collection">
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Contract"/>
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Grant"/>
+        </owl:unionOf>
+      </owl:Class>
+    </rdfs:domain>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#eRACommonsId">
     <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
@@ -48,7 +55,14 @@
     <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Authorship"/>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#grantDirectCosts">
-    <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Grant"/>
+    <rdfs:domain>
+      <owl:Class>
+        <owl:unionOf rdf:parseType="Collection">
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Contract"/>
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Grant"/>
+        </owl:unionOf>
+      </owl:Class>
+    </rdfs:domain>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#majorField">
     <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#EducationalProcess"/>
@@ -69,7 +83,14 @@
     <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Report"/>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#sponsorAwardId">
-    <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Grant"/>
+    <rdfs:domain>
+      <owl:Class>
+        <owl:unionOf rdf:parseType="Collection">
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Contract"/>
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Grant"/>
+        </owl:unionOf>
+      </owl:Class>
+    </rdfs:domain>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#licenseNumber">
     <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Licensure"/>
@@ -90,7 +111,14 @@
     <rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Patent"/>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#totalAwardAmount">
-    <rdfs:domain rdf:resource="http://vivoweb.org/ontology/core#Grant"/>
+    <rdfs:domain>
+      <owl:Class>
+        <owl:unionOf rdf:parseType="Collection">
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Contract"/>
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Grant"/>
+        </owl:unionOf>
+      </owl:Class>
+    </rdfs:domain>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#outreachOverview">
     <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Person"/>
diff --git a/rdf/tbox/filegraph/objectRanges.rdf b/rdf/tbox/filegraph/objectRanges.rdf
index dc75e58f..165d888e 100644
--- a/rdf/tbox/filegraph/objectRanges.rdf
+++ b/rdf/tbox/filegraph/objectRanges.rdf
@@ -36,7 +36,14 @@
     <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#Review"/>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasFundingVehicle">
-    <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#Grant"/>
+    <rdfs:range>
+      <owl:Class>
+        <owl:unionOf rdf:parseType="Collection">
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Contract"/>
+          <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Grant"/>
+        </owl:unionOf>
+      </owl:Class>
+    </rdfs:range>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasFacility">
     <rdfs:range rdf:resource="http://vivoweb.org/ontology/core#Facility"/>