From 6cc5387a9914e38cc1c1020b8cdc9785fb7ffbd5 Mon Sep 17 00:00:00 2001
From: Marshall McDonnell <mcdonnellmt@ornl.gov>
Date: Fri, 3 May 2019 11:28:25 -0400
Subject: [PATCH 1/2] Update to SciData schema from JSON Schema Draft 4 to 7

---
 schema/scidata.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/schema/scidata.json b/schema/scidata.json
index 8dc02e8..45b66aa 100755
--- a/schema/scidata.json
+++ b/schema/scidata.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "Scientific Data Schema",
     "description": "JSON schema for scientific data",
     "required": [
@@ -192,4 +192,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

From 1d726c5b491b383afb492a741580dccfc4b5eff3 Mon Sep 17 00:00:00 2001
From: Marshall McDonnell <mcdonnellmt@ornl.gov>
Date: Fri, 14 Jun 2019 10:57:27 -0400
Subject: [PATCH 2/2] Dataset schema added

---
 schema/scidata_dataset.json | 94 +++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 schema/scidata_dataset.json

diff --git a/schema/scidata_dataset.json b/schema/scidata_dataset.json
new file mode 100644
index 0000000..0a1d199
--- /dev/null
+++ b/schema/scidata_dataset.json
@@ -0,0 +1,94 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Dataset Schema",
+  "description": "JSON schema for scientific datasets",
+  "type": "object",
+  "definitions": {
+    "dataSeries_def": {
+      "type": "object",
+      "id": "dataGroupID",
+      "properties": {
+        "@id": { "type": "string" },
+        "type": { "type": "string" },
+        "axis": { "type": "string" },
+        "axisLabel": { "type": "string" },
+        "parameterArray": {
+          "$ref": "parameter.json#/properties/parameterArray"
+        },
+        "datapoints": {
+          "type": "array",
+          "items": { "type": "string" }
+        }
+      }
+    },
+    "dataGroup_def": {
+      "type": "object",
+      "id": "dataGroupID",
+      "properties": {
+        "@id": { "type": "string" },
+        "name": { "type": "string" },
+        "source": { "type": "string" },
+        "scope": { "type": "string" },
+        "attributes": {
+          "type": "array",
+          "items": { "type": "string" }
+        },
+        "datapoint": {
+          "type": "array",
+          "items": { "$ref": "parameter.json#/properties/parameter" }
+        },
+        "dataseries": {
+          "type": "array",
+          "items": { "$ref": "#/definitions/dataSeries_def" }
+        },
+        "datagroup": {
+          "type": "array",
+          "items": { "type": "string" }
+        },
+        "datapoints": {
+          "type": "array",
+          "items": { "type": "string" }
+        },
+        "dataserieses": {
+          "type": "array",
+          "items": { "type": "string" }
+        },
+        "datagroups": {
+          "type": "array",
+          "items": { "type": "string" }
+        }
+      }
+    }
+  },
+  "properties": {
+    "@context": {
+      "$ref": "context.json#/@context",
+      "default": [
+        "http://stuchalk.github.io/scidata/contexts/scidata_dataset.jsonld"
+      ]
+    },
+    "@id": {
+      "type": "string",
+      "default": ""
+    },
+    "name": { "type": "string" },
+    "source": { "type": "string" },
+    "scope": { "type": "string" },
+    "attributes": {
+      "type": "array",
+      "items": { "type": "string" }
+    },
+    "datapoint": {
+      "type": "array",
+      "items": { "$ref": "parameter.json#/properties/parameter" }
+    },
+    "dataseries": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/dataSeries_def" }
+    },
+    "datagroup": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/dataGroup_def" }
+    }
+  }
+}