Revert "fdo profile fixes (#208)"

This reverts commit 55622d3.
DiSSCo · Oct 21, 2024 · cf57707 · cf57707
1 parent 55622d3
commit cf57707
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 29 deletions.
diff --git a/data-model/fdo-profile/digital-media/1.0.0/schema/digital-media-request-attributes.json b/data-model/fdo-profile/digital-media/1.0.0/schema/digital-media-request-attributes.json
@@ -61,35 +61,44 @@
       "type": "string",
       "description": "Only mimetypes for audio, image, model, video, text should be provided. https://www.iana.org/assignments/media-types/media-types.xhtml"
     },
+    "license": {
+      "type": "string",
+      "description": "Maps to dcterms:license, unenforced value that may or may not be machine actionable. http://purl.org/dc/terms/license.",
+      "example": "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
+      "$comment": "idx = 409"
+    },
     "licenseName": {
       "type": "string",
       "description": "Human-readable name of the license",
       "example": "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
       "$comment": "idx = 409"
     },
-    "licenseId": {
+    "licenseUrl": {
       "type": "string",
       "description": "Machine-actionable licensing information. Uses SPDX Identifiers.",
       "example": "https://spdx.org/licenses/CC0-1.0",
       "$comment": "idx = 410"
     },
-    "rightsHolderName": {
+    "rightsHolder": {
       "type": "string",
       "description": "If not present, defaults to mediaHost, https://purl.org/dc/terms/rightsHolder",
       "example": "https://ror.org/0566bfb96"
     },
-    "rightsHolderId": {
+    "rightsHolderPid": {
       "type": "string",
       "description": "Resolvable identifier of the rights holder",
       "example": "https://ror.org/0566bfb96"
     }
   },
   "required": [
+    "referentName",
     "mediaHost",
     "mediaHostName",
     "linkedDigitalObjectPid",
     "linkedDigitalObjectType",
-    "primaryMediaId"
+    "primaryMediaId",
+    "license",
+    "rightsHolder"
   ],
   "additionalProperties": false
 }
diff --git a/data-model/fdo-profile/digital-media/1.0.0/schema/digital-media.json b/data-model/fdo-profile/digital-media/1.0.0/schema/digital-media.json
@@ -184,7 +184,7 @@
       "$comment": "idx = 405"
     },
     "primaryMediaIdName": {
-      "example": "ac:accessUrl",
+      "example": "ac:accessUr",
       "$comment": "idx = 406"
     },
     "mediaType": {
@@ -213,23 +213,23 @@
     },
     "licenseName": {
       "type": "string",
-      "description": "Maps to dcterms:license http://purl.org/dc/terms/license.",
+      "description": "http://purl.org/dc/terms/license.",
       "example": "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
       "$comment": "idx = 409"
     },
-    "licenseId": {
+    "licenseUrl": {
       "type": "string",
       "description": "Machine-actionable licensing information. Uses SPDX Identifiers.",
       "example": "https://spdx.org/licenses/CC0-1.0",
       "$comment": "idx = 410"
     },
-    "rightsHolderName": {
+    "rightsHolder": {
       "type": "string",
       "description": "Usually the creator of the object, holds the copyright for the object. Defaults to the supplier of the media object. if no other rights holder is specified",
       "example": "https://ror.org/0566bfb96",
       "$comment": "idx = 411"
     },
-    "rightsHolderId": {
+    "rightsHolderPid": {
       "type": "string",
       "description": "Identifier of the rights holder",
       "$comment": "idx = 412"
@@ -238,6 +238,8 @@
   "additionalProperties": false,
   "required": [
     "fdoProfile",
+    "fdoRecordLicenseId",
+    "fdoRecordLicenseName",
     "digitalObjectType",
     "digitalObjectName",
     "pid",
@@ -255,6 +257,6 @@
     "linkedDigitalObjectType",
     "primaryMediaId",
     "licenseName",
-    "rightsHolderId"
+    "rightsHolder"
   ]
 }
diff --git a/...-model/fdo-profile/digital-specimen/1.0.0/schema/digital-specimen-request-attributes.json b/...-model/fdo-profile/digital-specimen/1.0.0/schema/digital-specimen-request-attributes.json
@@ -2,7 +2,7 @@
   "$id": "https://schemas.dissco.tech/schemas/fdo-profile/digital-specimen/0.1.0/digital-specimen-request-attributes.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "description": "Attributes of a request to the DiSSCo PID API to create a FDO Record for a digital specimen",
-  "$comment": "FDO Profile Version 1.0.0",
+  "$comment": "FDO Profile Version 0.1.0",
   "properties": {
     "locations": {
       "type": "array",
@@ -94,7 +94,7 @@
       "enum": [
         "Human remains",
         "Hominid remains",
-        "Macrofungi, Lichens & Myxomycetes",
+        "Mycology",
         "Algae",
         "Bryophytes",
         "Pteridophytes",
@@ -128,18 +128,13 @@
         "Other Palaeontology Objects",
         "Minerals and Gems",
         "Loose Sediment Sample",
-        "Mixed Solid Matter Sample",
+        "Mixed Solid Mater Sample",
         "Water-Ice Sample",
         "Liquid or Gaseous Matter Sample",
         "Mixed Geology Objects",
         "Terrestrial Finds/Falls",
         "Terrestrial Impacta",
         "Sample Returns",
-        "Sedimentary Rock",
-        "Metamorphic or Igneous Rock",
-        "Plant Genetic Resource",
-        "Floral and Faunal remains",
-        "Other Anthropology Objects",
         "Unclassified"
       ],
       "description": "Countable things (objects) served as a more detailed classification of each of the disciplines."
@@ -180,6 +175,7 @@
     }
   },
   "required": [
+    "issuedForAgent",
     "specimenHost",
     "normalisedPrimarySpecimenObjectId"
   ],

diff --git a/data-model/fdo-profile/digital-specimen/1.0.0/schema/digital-specimen.json b/data-model/fdo-profile/digital-specimen/1.0.0/schema/digital-specimen.json
@@ -161,11 +161,11 @@
       "type": "string",
       "description": "For internal processing purposes only to make a local identifier globally unique. This is the primarySpecimenObjectId if it is globally unique or a combination of ROR ID string, source system ID string, primarySpecimenObjectId if it is a proprietary identifier.",
       "example": "0566bfb96:20.5000.1025/GEE-W3J-HL2:RMNH.1.2b",
-      "$comment": "idx = 202"
+      "$comment": "idx = 203"
     },
     "otherSpecimenIds": {
       "type": "array",
-      "$comment": "idx = 203",
+      "$comment": "idx = 207",
       "items": {
         "type": "object",
         "properties": {
@@ -185,7 +185,8 @@
           "identifierType"
         ],
         "additionalProperties": false
-      }
+      },
+      "$comment": "idx = 204"
     },
     "topicOrigin": {
       "enum": [
@@ -195,7 +196,7 @@
         "Unclassified"
       ],
       "description": "Highest-level terms identifying the fundamentals of the activities, in which context the objects in the collection were collected.",
-      "$comment": "idx = 204"
+      "$comment": "idx = 205"
     },
     "topicDomain": {
       "enum": [
@@ -208,7 +209,7 @@
         "Unclassified"
       ],
       "description": "High-level terms providing general domain information with which the objects are associated.",
-      "$comment": "idx = 205"
+      "$comment": "idx = 206"
     },
     "topicDiscipline": {
       "enum": [
@@ -225,7 +226,7 @@
         "Unclassified"
       ],
       "description": "Overarching classification of the scientific discipline to which the objects within the collection belong or are related.",
-      "$comment": "idx = 206"
+      "$comment": "idx = 207"
     },
     "topicCategory": {
       "enum": [
@@ -280,15 +281,15 @@
         "Unclassified"
       ],
       "description": "Countable things (objects) served as a more detailed classification of each of the disciplines.",
-      "$comment": "idx = 207"
+      "$comment": "idx = 208"
     },
     "livingOrPreserved": {
       "enum": [
         "Living",
         "Preserved"
       ],
       "description": "State of specimen",
-      "$comment": "idx = 208"
+      "$comment": "idx = 209"
     },
     "materialSampleType": {
       "enum": [
@@ -300,17 +301,17 @@
         "Research product"
       ],
       "description": "https://isamplesorg.github.io/models/generated/vocabularies/specimenType.html",
-      "$comment": "idx = 209"
+      "$comment": "idx = 211"
     },
     "markedAsType": {
       "type": "boolean",
       "description": "TRUE if the specimen is marked as type with a stamp or label.\n",
-      "$comment": "idx = 210"
+      "$comment": "idx = 212"
     },
     "catalogNumber": {
       "type": "string",
       "description": "Identifier of source system catalog",
-      "$comment": "idx = 211"
+      "$comment": "idx = 213"
     }
   },
   "additionalProperties": false,