Dealing with licenses across the different entities - closes #28

biocaddie · Aug 30, 2016 · f93837d · f93837d
1 parent 3084dd8
commit f93837d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/json-schemas/access_schema.json b/json-schemas/access_schema.json
@@ -53,21 +53,6 @@
         "$ref": "annotation_schema.json#"
       }
     },
-    "licenses": {
-      "description": "Terms of usage as specified on a license or data use agreement.",
-      "type": "array",
-      "items": {
-        "oneOf": [
-          {
-            "$ref": "license_schema.json#"
-          },
-          {
-            "type": "string",
-            "format": "uri"
-          }
-        ]
-      }
-    },
     "extraProperties": {
       "description": "Extra properties that do not fit in the previous specified attributes. ",
       "type": "array",

diff --git a/json-schemas/data_repository_schema.json b/json-schemas/data_repository_schema.json
@@ -86,7 +86,7 @@
         "$ref": "data_repository_schema.json#"
       }
     },
-    "accessModalities" : {
+    "accessInformation" : {
       "description": "The information about access modality for the data repository.",
       "type" : "array",
       "items" : {

diff --git a/json-schemas/dataset_distribution_schema.json b/json-schemas/dataset_distribution_schema.json
@@ -30,8 +30,8 @@
       "type" : "string"
     },
     "description" : {
-            "description": "A textual narrative comprised of one or more statements describing the dataset distribution.",
-            "type" : "string"
+      "description": "A textual narrative comprised of one or more statements describing the dataset distribution.",
+      "type" : "string"
     },
     "storedIn" : {
       "description": "The data repository hosting the dataset distribution.",
@@ -48,9 +48,16 @@
       "description": "A release point for the dataset when applicable.",
       "type" : "string"
     },
+    "licenses": {
+      "description": "The terms of use of the dataset distribution.",
+      "type": "array",
+      "items": {
+        "$ref": "license_schema.json#"
+      }
+    },
     "accessInformation" : {
       "description": "The information about access modality for the dataset distribution.",
-       "$ref" : "access_schema.json#"
+      "$ref" : "access_schema.json#"
     },
     "curationStatus": {
       "description": "The level of curation of the dataset distribution.",
@@ -70,7 +77,7 @@
       "description": "One or more characteristics of the dataset distribution (e.g. how it relates to other distributions, if the data is raw or processed, compressed or encrypted).",
       "type" : "array",
       "items" : {
-         "anyOf": [
+        "anyOf": [
           { "$ref": "annotation_schema.json#"},
           { "$ref": "category_values_pair_schema.json#"}
         ]

diff --git a/json-schemas/dataset_schema.json b/json-schemas/dataset_schema.json
@@ -95,6 +95,13 @@
             },
             "minItems" : 1
         },
+        "licenses": {
+            "description": "The terms of use of the dataset.",
+            "type": "array",
+            "items": {
+                "$ref": "license_schema.json#"
+            }
+        },
         "isAbout": {
             "description" : "Different entiies (biological entity, taxonomic information, disease, molecular entity, anatomical part, treatment) associated with this dataset.",
             "type": "array",