Skip to content

Commit

Permalink
Merge pull request #97 from DiSSCo/feature/all-objects-to-0.3.0
Browse files Browse the repository at this point in the history
Restructure of openDS datamodels and new versions
  • Loading branch information
samleeflang authored Jun 17, 2024
2 parents 6a8afae + 7ef5f01 commit 78a489a
Show file tree
Hide file tree
Showing 125 changed files with 2,000 additions and 279 deletions.
94 changes: 63 additions & 31 deletions data-model/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,66 @@ FROM nginxinc/nginx-unprivileged:1.26-alpine

COPY ./nginx/nginx.conf /etc/nginx/nginx.conf

COPY ./annotations/0.1.0/schema/annotation.json schema-root/schemas/annotations/0.1.0/annotation.json
COPY ./annotations/0.1.0/schema/annotation-for-mas.json schema-root/schemas/annotations/0.1.0/annotation-for-mas.json
COPY ./annotations/0.1.0/schema/annotation-event.json schema-root/schemas/annotations/0.1.0/annotation-event.json

COPY ./fdo-profiles/0.1.0/annotation/schema/ schema-root/schemas/fdo-profiles/0.1.0/
COPY ./fdo-profiles/0.1.0/digital-specimen/schema/ schema-root/schemas/fdo-profiles/0.1.0/
COPY ./fdo-profiles/0.1.0/doi-kernel/schema/ schema-root/schemas/fdo-profiles/0.1.0/
COPY ./fdo-profiles/0.1.0/handle-kernel/schema/ schema-root/schemas/fdo-profiles/0.1.0/
COPY ./fdo-profiles/0.1.0/mapping/schema/ schema-root/schemas/fdo-profiles/0.1.0/
COPY ./fdo-profiles/0.1.0/mas/schema/ schema-root/schemas/fdo-profiles/0.1.0/
COPY ./fdo-profiles/0.1.0/media-object/schema/ schema-root/schemas/fdo-profiles/0.1.0/
COPY ./fdo-profiles/0.1.0/organisation/schema/ schema-root/schemas/fdo-profiles/0.1.0/
COPY ./fdo-profiles/0.1.0/source-system/schema/ schema-root/schemas/fdo-profiles/0.1.0/
COPY ./fdo-profiles/0.1.0/tettris-service/schema/ schema-root/schemas/fdo-profiles/0.1.0/
COPY ./fdo-profiles/0.1.0/tombstone/schema/ schema-root/schemas/fdo-profiles/0.1.0/
COPY ./fdo-profiles/0.1.0/virtual-collections/schema/ schema-root/schemas/fdo-profiles/0.1.0/

COPY ./annotations/0.1.0/schema/annotation.json schema-root/schemas/fdo-types/0.1.0/annotation.json
COPY ./fdo-types/0.1.0/digital-specimens/schema schema-root/schemas/fdo-types/0.1.0/digital-specimens
COPY ./fdo-types/0.1.0/shared-models/schema schema-root/schemas/fdo-types/0.1.0/shared-models
COPY ./fdo-types/0.1.0/digital-media-objects/schema schema-root/schemas/fdo-types/0.1.0/digital-media-objects
COPY ./fdo-types/0.1.0/machine-annotation-services/schema schema-root/schemas/fdo-types/0.1.0/machine-annotation-services
COPY ./fdo-types/0.1.0/mappings/schema schema-root/schemas/fdo-types/0.1.0/mappings
COPY ./fdo-types/0.1.0/source-systems/schema schema-root/schemas/fdo-types/0.1.0/source-systems
COPY ./fdo-types/0.1.0/virtual-collections/schema schema-root/schemas/fdo-types/0.1.0/vitual-collections

COPY ./fdo-types/0.2.0/digital-specimens/schema schema-root/schemas/fdo-types/0.2.0/digital-specimens

COPY ./fdo-types/0.3.0/digital-specimens/schema schema-root/schemas/fdo-types/0.3.0/digital-specimens
COPY ./fdo-types/0.3.0/shared-models/schema schema-root/schemas/fdo-types/0.3.0/shared-models
COPY ./fdo-types/0.3.0/digital-media-objects/schema schema-root/schemas/fdo-types/0.3.0/digital-media-objects
# Versioned FDO Profile schemas
COPY fdo-profile/annotation/0.1.0/schema schema-root/schemas/fdo-profile/annotation/0.1.0
COPY fdo-profile/digital-specimen/0.1.0/schema/ schema-root/schemas/fdo-profile/digital-specimen/0.1.0
COPY fdo-profile/doi-kernel/0.1.0/schema schema-root/schemas/fdo-profile/doi-kernel/0.1.0
COPY fdo-profile/handle-kernel/0.1.0/schema schema-root/schemas/fdo-profile/handle-kernel/0.1.0
COPY fdo-profile/mapping/0.1.0/schema schema-root/schemas/fdo-profile/mapping/0.1.0
COPY fdo-profile/mas/0.1.0/schema schema-root/schemas/fdo-profile/mas/0.1.0
COPY fdo-profile/media-object/0.1.0/schema schema-root/schemas/fdo-profile/media-object/0.1.0
COPY fdo-profile/organisation/0.1.0/schema schema-root/schemas/fdo-profile/organisation/0.1.0
COPY fdo-profile/source-system/0.1.0/schema schema-root/schemas/fdo-profile/source-system/0.1.0
COPY fdo-profile/tettris-service/0.1.0/schema schema-root/schemas/fdo-profile/tettris-service/0.1.0
COPY fdo-profile/tombstone/0.1.0/schema schema-root/schemas/fdo-profile/tombstone/0.1.0
COPY fdo-profile/virtual-collection/0.1.0/schema schema-root/schemas/fdo-profile/virtual-collection/0.1.0

# Latest FDO Profile schemas
COPY fdo-profile/annotation/0.1.0/schema schema-root/schemas/fdo-profile/annotation/latest
COPY fdo-profile/digital-specimen/0.1.0/schema/ schema-root/schemas/fdo-profile/digital-specimen/latest
COPY fdo-profile/doi-kernel/0.1.0/schema schema-root/schemas/fdo-profile/doi-kernel/latest
COPY fdo-profile/handle-kernel/0.1.0/schema schema-root/schemas/fdo-profile/handle-kernel/latest
COPY fdo-profile/mapping/0.1.0/schema schema-root/schemas/fdo-profile/mapping/latest
COPY fdo-profile/mas/0.1.0/schema schema-root/schemas/fdo-profile/mas/latest
COPY fdo-profile/media-object/0.1.0/schema schema-root/schemas/fdo-profile/media-object/latest
COPY fdo-profile/organisation/0.1.0/schema schema-root/schemas/fdo-profile/organisation/latest
COPY fdo-profile/source-system/0.1.0/schema schema-root/schemas/fdo-profile/source-system/latest
COPY fdo-profile/tettris-service/0.1.0/schema schema-root/schemas/fdo-profile/tettris-service/latest
COPY fdo-profile/tombstone/0.1.0/schema schema-root/schemas/fdo-profile/tombstone/latest
COPY fdo-profile/virtual-collection/0.1.0/schema schema-root/schemas/fdo-profile/virtual-collection/latest

# Versioned FDO Type schemas
COPY fdo-type/annotation/0.3.0/schema schema-root/schemas/fdo-type/annotation/0.3.0
COPY fdo-type/create-update-tombstone-event/0.3.0/schema schema-root/schemas/fdo-type/create-update-tombstone-event/0.3.0
COPY fdo-type/digital-entity/0.3.0/schema schema-root/schemas/fdo-type/digital-entity/0.3.0
COPY fdo-type/digital-specimen/0.3.0/schema schema-root/schemas/fdo-type/digital-specimen/0.3.0
COPY fdo-type/machine-annotation-service/0.3.0/schema schema-root/schemas/fdo-type/machine-annotation-service/0.3.0
COPY fdo-type/mapping/0.3.0/schema schema-root/schemas/fdo-type/mapping/0.3.0
COPY fdo-type/shared-model/0.3.0/schema schema-root/schemas/fdo-type/shared-models/0.3.0
COPY fdo-type/source-system/0.3.0/schema schema-root/schemas/fdo-type/source-system/0.3.0
COPY fdo-type/tettris-service/0.1.0/schema schema-root/schemas/fdo-type/tettris-service/0.1.0
COPY fdo-type/virtual-collection/0.1.0/schema schema-root/schemas/fdo-type/vitual-collection/0.1.0

# Latest FDO Type schemas
COPY fdo-type/annotation/0.3.0/schema schema-root/schemas/fdo-type/annotation/latest
COPY fdo-type/create-update-tombstone-event/0.3.0/schema schema-root/schemas/fdo-type/create-update-tombstone-event/latest
COPY fdo-type/digital-entity/0.3.0/schema schema-root/schemas/fdo-type/digital-entity/latest
COPY fdo-type/digital-specimen/0.3.0/schema schema-root/schemas/fdo-type/digital-specimen/latest
COPY fdo-type/machine-annotation-service/0.3.0/schema schema-root/schemas/fdo-type/machine-annotation-service/latest
COPY fdo-type/mapping/0.3.0/schema schema-root/schemas/fdo-type/mapping/latest
COPY fdo-type/shared-model/0.3.0/schema schema-root/schemas/fdo-type/shared-models/latest
COPY fdo-type/source-system/0.3.0/schema schema-root/schemas/fdo-type/source-system/latest
COPY fdo-type/tettris-service/0.1.0/schema schema-root/schemas/fdo-type/tettris-service/latest
COPY fdo-type/virtual-collection/0.1.0/schema schema-root/schemas/fdo-type/vitual-collection/latest

# Versioned Developer schemas
COPY developer-schema/annotation/0.2.0/schema schema-root/schemas/developer-schema/annotation/0.2.0

# Latest Developer schemas
COPY developer-schema/annotation/0.2.0/schema schema-root/schemas/developer-schema/annotation/latest

# Versioned internal schemas
COPY internal-schema/annotation/0.1.0/schema schema-root/schemas/internal-schema/annotation/0.1.0

# Latest internal schemas
COPY internal-schema/annotation/0.1.0/schema schema-root/schemas/internal-schema/annotation/latest
91 changes: 0 additions & 91 deletions data-model/data-model-intro.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://schemas.dissco.tech/schemas/annotations/0.1.0/annotation-event.json",
"description": "Object sent to annotation processing service from core backend. Internal use only.",
"$id": "https://schemas.dissco.tech/schemas/developer-schema/annotation/0.1.0/annotation-event.json",
"description": "Object sent to annotation processing service",
"properties": {
"annotations": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/annotations/0.1.0/annotation-for-mas.json"
"$ref": "https://schemas.dissco.tech/schemas/developer-schema/annotation/0.1.0/annotation-for-mas.json"
}
},
"jobId": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://schemas.dissco.tech/schemas/annotations/0.1.0/annotations-for-mas.json",
"$id": "https://schemas.dissco.tech/schemas/developer-schema/annotation/0.1.0/annotation-for-mas.json",
"type": "object",
"description": "Schema specific to Machine Annotation Services providing information to DiSSCo.",
"properties": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://schemas.dissco.tech/schemas/developer-schema/annotation/0.2.0/annotation-event.json",
"description": "Object sent to annotation processing service",
"properties": {
"@type": {
"@type": {
"type": "string",
"description": "The type of the object, in this case ods:BatchMetaData",
"const": "ods:AnnotationEvent"
}
},
"ods:hasAnnotation": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/developer-schemas/annotations/0.2.0/annotation-for-mas.json"
}
},
"ods:jobID": {
"type": "string",
"description": "Handle of the job record, if the annotation was produced by a Machine Annotation Service",
"pattern": "https:\/\/hdl\\.handle\\.net\/\\w+\/(.){3}-(.){3}-(.){3}"
},
"ods:hasBatchMetadata": {
"type": "array",
"items": {
"type": "object",
"properties": {
"@type": {
"type": "string",
"description": "The type of the object, in this case ods:BatchMetaData",
"const": "ods:BatchMetaData"
},
"ods:placeInBatch": {
"type": "integer",
"description": "The place in the batch",
"minimum": 0
},
"ods:inputField": {
"type": "string"
},
"ods:inputValue": {
"type": "string"
}
}
},
"additionalProperties": false
},
"required": [
"@type",
"ods:hasAnnotation",
"ods:jobID"
],
"additionalProperties": false
}
}
Loading

0 comments on commit 78a489a

Please sign in to comment.