Skip to content

Commit

Permalink
Merge pull request #95 from DiSSCo/feature/specimen-0.3.0
Browse files Browse the repository at this point in the history
Fix refs
  • Loading branch information
samleeflang authored Jun 7, 2024
2 parents 5cb29cf + 147dd7a commit 619fabc
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -130,35 +130,35 @@
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/assertion.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/assertion.json"
}
},
"ods:hasCitation": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/citation.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/citation.json"
}
},
"ods:hasIdentifier": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/identifier.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/identifier.json"
}
},
"ods:hasEntityRelationship": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/entity-relationship.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/entity-relationship.json"
}
},
"ods:hasAgent": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/agent.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/agent.json"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,65 +341,63 @@
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/material-entity.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/material-entity.json"
}
},
"ods:hasIdentification": {
"type": "array",
"items": {
"type": "object",
"description": "https://rs.tdwg.org/dwc/terms/Identification",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/identification.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/identification.json"
}
},
"ods:hasAssertion": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/assertion.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/assertion.json"
}
},
"ods:hasEvent": {
"type": "array",
"items": {
"type": "object",
"description": "https://rs.tdwg.org/dwc/terms/Event",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/event.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/event.json"
}
},
"ods:hasEntityRelationship": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/entity-relationship.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/entity-relationship.json"
}
},
"ods:hasCitation": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/citation.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/citation.json"
}
},
"ods:hasIdentifier": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/identifier.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/identifier.json"
}
},
"ods:hasChronometricAge": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/chronometric-age.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/chronometric-age.json"
}
},
"ods:hasAgent": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/agent.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/agent.json"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/event.json",
"$id": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/event.json",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$comment": "Event Version 0.3.0",
"type": "object",
Expand Down Expand Up @@ -272,12 +272,12 @@
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/assertion.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/assertion.json"
}
},
"ods:Location": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/location.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/location.json"
}
},
"required": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/identification.json",
"$id": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/identification.json",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$comment": "Identification object Version 0.3.0",
"type": "object",
Expand Down Expand Up @@ -72,7 +72,7 @@
},
"ods:isVerifiedIdentification": {
"type": "boolean",
"description": "If this is the accepted identification, based on https://rs.tdwg.org/dwc/terms/identificationVerificationStatus",
"description": "If this is the accepted identification, based on https://rs.tdwg.org/dwc/terms/identificationVerificationStatus"
},
"dwc:identificationRemarks": {
"type": "string",
Expand All @@ -92,7 +92,7 @@
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/citation.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/citation.json"
}
},
"ods:hasTaxonIdentification": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/location.json",
"$id": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/location.json",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$comment": "Location Version 0.3.0",
"type": "object",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/material-entity.json",
"$id": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/material-entity.json",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"type": "object",
"$comment": "Material Entity Version 0.3.0, only if the part did not get a separate catalogue number, otherwise it will be a separate digital specimen itself",
Expand Down Expand Up @@ -109,49 +109,49 @@
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/identification.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/identification.json"
}
},
"ods:hasAssertion": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/assertion.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/assertion.json"
}
},
"ods:hasEntityRelationship": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/entity-relationship.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/entity-relationship.json"
}
},
"ods:hasCitation": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/citation.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/citation.json"
}
},
"ods:hasIdentifier": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/identifier.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/identifier.json"
}
},
"ods:hasEvent": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/digital-specimens/event.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/digital-specimens/event.json"
}
},
"ods:hasAgent": {
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/agent.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/agent.json"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion data-model/fdo-types/0.3.0/shared-models/schema/agent.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"type": "array",
"items": {
"type": "object",
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.3.0/shared-models/identifier.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.3.0/shared-models/identifier.json"
}
}
},
Expand Down

0 comments on commit 619fabc

Please sign in to comment.