From 4f70c761fdc30d81b9d72c03d3b37b33a30e8c1f Mon Sep 17 00:00:00 2001 From: Sam Leeflang Date: Mon, 1 Jul 2024 11:51:02 +0200 Subject: [PATCH] Code review --- .../0.3.0/examples/approved-annotation-example.json | 8 ++++---- .../annotation/0.3.0/examples/tombstoned-annotation.json | 2 +- .../fdo-type/annotation/0.3.0/schema/annotation.json | 8 ++++---- .../0.3.0/examples/tombstoned-data-mapping-example.json | 2 +- .../0.3.0/examples/tombstoned-digital-media-example.json | 2 +- .../0.3.0/examples/tombstoned-digital-specimen.json | 2 +- .../0.3.0/examples/tombstone-metadata-example.json | 2 +- .../shared-model/0.3.0/schema/tombstone-metadata.json | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data-model/fdo-type/annotation/0.3.0/examples/approved-annotation-example.json b/data-model/fdo-type/annotation/0.3.0/examples/approved-annotation-example.json index 47d137df..d2531008 100644 --- a/data-model/fdo-type/annotation/0.3.0/examples/approved-annotation-example.json +++ b/data-model/fdo-type/annotation/0.3.0/examples/approved-annotation-example.json @@ -5,7 +5,7 @@ "ods:status": "ods:Active", "rdf:type": "ods:Annotation", "ods:version": 1, - "oa:motivation": "oa:commenting", + "oa:motivation": "oa:editing", "oa:hasTarget": { "@id": "https://hdl.handle.net/20.5000.1025/XYZ-XYZ-XYZ", "@type": "ods:DigitalSpecimen", @@ -24,8 +24,8 @@ }, "dcterms:creator": { "@id": "https://orcid.org/0000-0002-5669-2769", - "@type": "foaf:Person", - "foaf:name": "John Doe" + "@type": "schema:Person", + "schema:name": "John Doe" }, "dcterms:created": "2024-06-27T12:00:00Z", "as:generator": { @@ -35,7 +35,7 @@ }, "dcterms:issued": "2024-06-27T12:00:00Z", "ods:batchID": "batch-1234", - "ods:annotationStatus": "ods:Approved", + "ods:mergingDecisionStatus": "ods:Approved", "ods:mergingStateChangeDate": "2024-06-28T12:00:00Z", "ods:MergingStateChangedBy": { "@id": "https://orcid.org/0000-0002-5669-2769", diff --git a/data-model/fdo-type/annotation/0.3.0/examples/tombstoned-annotation.json b/data-model/fdo-type/annotation/0.3.0/examples/tombstoned-annotation.json index e8248b69..f5a2cc75 100644 --- a/data-model/fdo-type/annotation/0.3.0/examples/tombstoned-annotation.json +++ b/data-model/fdo-type/annotation/0.3.0/examples/tombstoned-annotation.json @@ -39,7 +39,7 @@ "ods:TombstoneMetadata": { "@type": "ods:Tombstone", "ods:tombstonedDate": "2023-06-15T14:30:00Z", - "ods:tombstonedReason": "This object was made by mistake", + "ods:tombstonedText": "This object was made by mistake", "ods:TombstonedByAgent": { "@id": "https://orcid.org/0000-0002-5669-2769", "@type": "schema:Person", diff --git a/data-model/fdo-type/annotation/0.3.0/schema/annotation.json b/data-model/fdo-type/annotation/0.3.0/schema/annotation.json index bcec20dd..0f703e12 100644 --- a/data-model/fdo-type/annotation/0.3.0/schema/annotation.json +++ b/data-model/fdo-type/annotation/0.3.0/schema/annotation.json @@ -324,11 +324,11 @@ "type": "string", "description": "Internally generated PID to identify the batch the annotation was generated by" }, - "ods:mergingStatus": { + "ods:mergingDecisionStatus": { "enum": [ - "ods:DecisionPendingForMerging", - "ods:RejectedForMerging", - "ods:ApprovedForMerging" + "ods:Pending", + "ods:Rejected", + "ods:Approved" ], "description": "The merging status of the annotation. Only present when motivation is ods:adding or oa:editing" }, diff --git a/data-model/fdo-type/data-mapping/0.3.0/examples/tombstoned-data-mapping-example.json b/data-model/fdo-type/data-mapping/0.3.0/examples/tombstoned-data-mapping-example.json index bd05e3b2..47e6ba95 100644 --- a/data-model/fdo-type/data-mapping/0.3.0/examples/tombstoned-data-mapping-example.json +++ b/data-model/fdo-type/data-mapping/0.3.0/examples/tombstoned-data-mapping-example.json @@ -35,7 +35,7 @@ "ods:TombstoneMetadata": { "@type": "ods:Tombstone", "ods:tombstonedDate": "2023-06-15T14:30:00Z", - "ods:tombstonedReason": "This object was made by mistake", + "ods:tombstonedText": "This object was made by mistake", "ods:TombstonedByAgent": { "@id": "https://orcid.org/0000-0002-5669-2769", "@type": "schema:Person", diff --git a/data-model/fdo-type/digital-media/0.3.0/examples/tombstoned-digital-media-example.json b/data-model/fdo-type/digital-media/0.3.0/examples/tombstoned-digital-media-example.json index 62cbd84e..6370fdff 100644 --- a/data-model/fdo-type/digital-media/0.3.0/examples/tombstoned-digital-media-example.json +++ b/data-model/fdo-type/digital-media/0.3.0/examples/tombstoned-digital-media-example.json @@ -24,7 +24,7 @@ "ods:TombstoneMetadata": { "@type": "ods:Tombstone", "ods:tombstonedDate": "2023-06-15T14:30:00Z", - "ods:tombstonedReason": "This digital media was removed as it showed the wrong specimen", + "ods:tombstonedText": "This digital media was removed as it showed the wrong specimen", "ods:TombstonedByAgent": { "@id": "https://orcid.org/0000-0002-5669-2769", "@type": "schema:Person", diff --git a/data-model/fdo-type/digital-specimen/0.3.0/examples/tombstoned-digital-specimen.json b/data-model/fdo-type/digital-specimen/0.3.0/examples/tombstoned-digital-specimen.json index f8add707..b6b4de8f 100644 --- a/data-model/fdo-type/digital-specimen/0.3.0/examples/tombstoned-digital-specimen.json +++ b/data-model/fdo-type/digital-specimen/0.3.0/examples/tombstoned-digital-specimen.json @@ -128,7 +128,7 @@ "ods:TombstoneMetadata": { "@type": "ods:Tombstone", "ods:tombstonedDate": "2023-06-15T14:30:00Z", - "ods:tombstonedReason": "This digital media was removed as it showed the wrong specimen", + "ods:tombstonedText": "This digital media was removed as it showed the wrong specimen", "ods:TombstonedByAgent": { "@id": "https://orcid.org/0000-0002-5669-2769", "@type": "schema:Person", diff --git a/data-model/fdo-type/shared-model/0.3.0/examples/tombstone-metadata-example.json b/data-model/fdo-type/shared-model/0.3.0/examples/tombstone-metadata-example.json index e26bbd8d..8e21ebf4 100644 --- a/data-model/fdo-type/shared-model/0.3.0/examples/tombstone-metadata-example.json +++ b/data-model/fdo-type/shared-model/0.3.0/examples/tombstone-metadata-example.json @@ -1,7 +1,7 @@ { "@type": "ods:Tombstone", "ods:tombstonedDate": "2023-06-15T14:30:00Z", - "ods:tombstonedReason": "This object was made by mistake", + "ods:tombstonedText": "This object was made by mistake", "ods:TombstonedByAgent": { "@id": "https://example.org/agents/agent123", "@type": "schema:Person", diff --git a/data-model/fdo-type/shared-model/0.3.0/schema/tombstone-metadata.json b/data-model/fdo-type/shared-model/0.3.0/schema/tombstone-metadata.json index 961cd796..e7818657 100644 --- a/data-model/fdo-type/shared-model/0.3.0/schema/tombstone-metadata.json +++ b/data-model/fdo-type/shared-model/0.3.0/schema/tombstone-metadata.json @@ -19,7 +19,7 @@ "2021-06-01T12:00:000Z" ] }, - "ods:tombstonedReason": { + "ods:tombstonedText": { "type": "string", "description": "A reason why the Digital Object was tombstoned", "examples": [ @@ -60,7 +60,7 @@ "required": [ "@type", "ods:tombstonedDate", - "ods:tombstonedReason", + "ods:tombstonedText", "ods:TombstonedByAgent" ], "additionalProperties": false