diff --git a/jsonschema/definitions/Dataset.json b/jsonschema/definitions/Dataset.json index 82754373..2def1412 100644 --- a/jsonschema/definitions/Dataset.json +++ b/jsonschema/definitions/Dataset.json @@ -718,12 +718,21 @@ "publisher": { "title": "publisher", "description": "Organization responsible for publishing and making the dataset available", - "$ref": "/dcat-us/3.0.0/definitions/organization", + "anyOf": [ + { + "type": "null", + "title": "Null allowed when not required" + }, + { + "$ref": "/dcat-us/3.0.0/definitions/organization", + "description": "inline description of Organization" + } + ], "_oldDocs": { "uri": "dcterms:publisher", "range": "foaf:Agent" }, - "requirementLevel": "Mandatory" + "requirementLevel": "Recommended" }, "relation": { "title": "related resource", @@ -980,13 +989,7 @@ "requirementLevel": "Optional" } }, - "required": [ - "description", - "publisher", - "title", - "contactPoint", - "identifier" - ], + "required": ["description", "title", "contactPoint", "identifier"], "_oldDocs": { "rdfClass": "dcat:Dataset", "rationale": "The update of dcat:Dataset is crucial as it aligns the DCAT profile with international standards, offering a standardized and widely recognized way to describe datasets. This alignment enhances data interoperability and discoverability, enabling data publishers to provide structured metadata, improving data sharing, and facilitating seamless integration for users and applications.", diff --git a/jsonschema/docs/dataset.md b/jsonschema/docs/dataset.md index 31fd2072..75633ee9 100644 --- a/jsonschema/docs/dataset.md +++ b/jsonschema/docs/dataset.md @@ -138,7 +138,7 @@ A collection of data published or curated by one provider | [language](#language) | More than one type | Optional | ISO 639-1 language code values used in the dataset text or metadata, such as en or es, full list can be seen at https://id.loc.gov/vocabulary/iso639-1.html | | [modified](#modified) | More than one type | Recommended | Most recent date when the dataset's actual data changed, not just metadata | | [provenance](#provenance) | null or array of string | Optional | List of statements about the lineage of a Dataset, including any changes in its ownership or custody since its creation that may be significant for its authenticity, integrity, or interpretation | -| [publisher](#publisher) | object | Mandatory | Organization responsible for publishing and making the dataset available | +| [publisher](#publisher) | More than one type | Recommended | Organization responsible for publishing and making the dataset available | | [relation](#relation) | null or array of string | Optional | List of links to related resources when the relationship is not otherwise specified | | [replaces](#replaces) | null or array of [Dataset](./dataset.md#root) classes | Optional | List of Datasets replaced by this Dataset | | [rights](#rights) | null or array of string | Recommended | Rights statements not already covered by license or accessRights, such as copyright or policy restrictions | @@ -1323,15 +1323,32 @@ Full text of the provenance statement ## `Dataset > publisher` [#](#publisher) -**Requirement:** Mandatory +**Requirement:** Recommended Organization responsible for publishing and making the dataset available +| **Type** | `combining` | +| ------------------------- | ---------------- | +| **Additional properties** | Any type allowed | + +| Any of | +| ----------------------------------------------------- | +| [Null allowed when not required](#publisher_anyOf_i0) | +| [Organization](#publisher_anyOf_i1) | + +### `Dataset > publisher > anyOf > Null allowed when not required` [#](#publisher_anyOf_i0) + +| **Type** | `null` | +| -------- | ------ | + +### `Dataset > publisher > anyOf > Organization` [#](#publisher_anyOf_i1) + +inline description of Organization + | **Type** | `object` | | ------------------------- | ---------------------------------------- | -| **Required** | Yes | | **Additional properties** | Any type allowed | -| **Defined in** | [Organization](./agents.md#organization) | +| **Same definition as** | [Organization](./agents.md#organization) | ## `Dataset > relation` [#](#relation) diff --git a/jsonschema/examples/Catalog/bad/invalid_homepage_type.json b/jsonschema/examples/Catalog/bad/invalid_homepage_type.json index 7c480f32..5d18df9a 100644 --- a/jsonschema/examples/Catalog/bad/invalid_homepage_type.json +++ b/jsonschema/examples/Catalog/bad/invalid_homepage_type.json @@ -11,9 +11,7 @@ "fn": "Support", "hasEmail": "mailto:support@example.gov" }, - "publisher": { - "name": "Example Org" - } + "identifier": "https://example.gov/datasets/catalog-example-001" } ], "homepage": "https://example.gov/invalid-homepage-format" diff --git a/jsonschema/examples/Catalog/bad/invalid_issued_format.json b/jsonschema/examples/Catalog/bad/invalid_issued_format.json index 43275af8..83fd3bbf 100644 --- a/jsonschema/examples/Catalog/bad/invalid_issued_format.json +++ b/jsonschema/examples/Catalog/bad/invalid_issued_format.json @@ -11,9 +11,7 @@ "fn": "Support", "hasEmail": "mailto:support@example.gov" }, - "publisher": { - "name": "Example Org" - } + "identifier": "https://example.gov/datasets/catalog-example-001" } ], "issued": "January 15, 2020" diff --git a/jsonschema/examples/Catalog/bad/invalid_language_format.json b/jsonschema/examples/Catalog/bad/invalid_language_format.json index 51ec6e99..ad29af32 100644 --- a/jsonschema/examples/Catalog/bad/invalid_language_format.json +++ b/jsonschema/examples/Catalog/bad/invalid_language_format.json @@ -11,9 +11,7 @@ "fn": "Support", "hasEmail": "mailto:support@example.gov" }, - "publisher": { - "name": "Example Org" - } + "identifier": "https://example.gov/datasets/catalog-example-001" } ], "language": ["english", "spanish"] diff --git a/jsonschema/examples/Catalog/good/minimal_example.json b/jsonschema/examples/Catalog/good/minimal_example.json index 0ddb73af..3b2ef569 100644 --- a/jsonschema/examples/Catalog/good/minimal_example.json +++ b/jsonschema/examples/Catalog/good/minimal_example.json @@ -9,9 +9,6 @@ "fn": "Data Support", "hasEmail": "mailto:support@example.gov" }, - "publisher": { - "name": "Example Organization" - }, "identifier": "https://example.gov/datasets/catalog-example-001" } ] diff --git a/jsonschema/examples/Dataset/bad/bad-accrual-periodicity.json b/jsonschema/examples/Dataset/bad/bad-accrual-periodicity.json index 3f48de8a..93ad67ac 100644 --- a/jsonschema/examples/Dataset/bad/bad-accrual-periodicity.json +++ b/jsonschema/examples/Dataset/bad/bad-accrual-periodicity.json @@ -2,6 +2,10 @@ "@type": "Dataset", "title": "Example Dataset", "description": "A minimal dataset example with invalid periodicity", - "publisher": "https://example.gov/org/sample-agency", + "contactPoint": { + "fn": "Data Support", + "hasEmail": "mailto:support@example.gov" + }, + "identifier": "https://example.gov/datasets/catalog-example-001", "accrualPeriodicity": "every-other-tuesday" } diff --git a/jsonschema/examples/Dataset/good/good-accrual-periodicity.json b/jsonschema/examples/Dataset/good/good-accrual-periodicity.json index 5340c899..86074346 100644 --- a/jsonschema/examples/Dataset/good/good-accrual-periodicity.json +++ b/jsonschema/examples/Dataset/good/good-accrual-periodicity.json @@ -2,9 +2,6 @@ "@type": "Dataset", "title": "Example Dataset", "description": "A minimal dataset example with a valid periodicity", - "publisher": { - "name": "The Minimal Organization" - }, "accrualPeriodicity": "quarterly", "contactPoint": [ { diff --git a/jsonschema/examples/Dataset/good/minimal_example.json b/jsonschema/examples/Dataset/good/minimal_example.json index 7fb1bab4..6eeac437 100644 --- a/jsonschema/examples/Dataset/good/minimal_example.json +++ b/jsonschema/examples/Dataset/good/minimal_example.json @@ -1,9 +1,6 @@ { "title": "Example Dataset", "description": "A dataset for testing purposes.", - "publisher": { - "name": "Example Agency" - }, "contactPoint": { "fn": "Data Support", "hasEmail": "mailto:data@example.gov" diff --git a/jsonschema/examples/Dataset/good/null_example.json b/jsonschema/examples/Dataset/good/null_example.json index 03dbc5e2..ff639c47 100644 --- a/jsonschema/examples/Dataset/good/null_example.json +++ b/jsonschema/examples/Dataset/good/null_example.json @@ -18,7 +18,7 @@ "hasPart": null, "hasQualityMeasurement": null, "hasVersion": null, - "identifier": null, + "identifier": "", "image": null, "inSeries": null, "isReferencedBy": null, @@ -33,9 +33,7 @@ "page": null, "previousVersion": null, "provenance": null, - "publisher": { - "name": "" - }, + "publisher": null, "purpose": null, "qualifiedAttribution": null, "qualifiedRelation": null, diff --git a/jsonschema/examples/Dataset/good/theme_full_example.json b/jsonschema/examples/Dataset/good/theme_full_example.json index f8c7e8a8..de5d22a6 100644 --- a/jsonschema/examples/Dataset/good/theme_full_example.json +++ b/jsonschema/examples/Dataset/good/theme_full_example.json @@ -6,9 +6,6 @@ "fn": "Water Resources Support", "hasEmail": "mailto:water@example.gov" }, - "publisher": { - "name": "U.S. Environmental Protection Agency" - }, "theme": [ { "@type": "Concept", diff --git a/jsonschema/examples/Dataset/good/theme_simple_example.json b/jsonschema/examples/Dataset/good/theme_simple_example.json index aeb78b44..141b1a4e 100644 --- a/jsonschema/examples/Dataset/good/theme_simple_example.json +++ b/jsonschema/examples/Dataset/good/theme_simple_example.json @@ -6,9 +6,6 @@ "fn": "Water Resources Support", "hasEmail": "mailto:water@example.gov" }, - "publisher": { - "name": "U.S. Environmental Protection Agency" - }, "theme": [ "https://example.gov/themes/water", "https://example.gov/themes/environment"