From 178670fcc11c690f7b8687d52711890109b7ad5e Mon Sep 17 00:00:00 2001 From: Matthias Mohr Date: Tue, 2 Feb 2021 23:40:11 +0100 Subject: [PATCH] Relaxed the regular expression for DOIs in the scientific extension #910 --- CHANGELOG.md | 3 ++- extensions/scientific/README.md | 4 ++-- extensions/scientific/json-schema/schema.json | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d2768948..6395dc12b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - 'via' and 'canonical' rel types as options in items. - Added clarification about how collection-level asset object properties do not remove the need for item-level asset object properties in the `item-assets` extension ([#880](https://github.com/radiantearth/stac-spec/pull/880)) - Added [processing extension](extensions/processing/README.md) -- Added [file info extension](extensions/file/README.md) ([#879](https://github.com/radiantearth/stac-spec/pull/879), [#921](https://github.com/radiantearth/stac-spec/issues/921)) +- Added [file info extension](extensions/file/README.md) ([#879](https://github.com/radiantearth/stac-spec/pull/879), [#921](https://github.com/radiantearth/stac-spec/issues/921)) - Added additional acquisition parameters in the `sat` extension: sat:platform_international_designator, sat:absolute_orbit, sat:anx_datetime* ([#894](https://github.com/radiantearth/stac-spec/pull/894)) - Recommendation to enable CORS @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Clarified the role of geometries on items in the label extension - Data Cube Extension: Units for STAC dimensions in should now be compliant to UDUNITS-2 units (singular) whenever available. +- Relaxed the regular expression for DOIs in the scientific extension ([#910](https://github.com/radiantearth/stac-spec/issues/910)) ### Removed diff --git a/extensions/scientific/README.md b/extensions/scientific/README.md index ba0c40200..1581db38f 100644 --- a/extensions/scientific/README.md +++ b/extensions/scientific/README.md @@ -28,7 +28,7 @@ For Items, the fields are placed in the `properties`. For Collections, the field | Field Name | Type | Description | | ---------------- | -------------------- | ----------- | -| sci:doi | string | The DOI name of the data, e.g. `10.1000/xyz123`. This MUST NOT be a DOIs link. For all DOI names respective DOI links SHOULD be added to the links section (see chapter "Relation types"). | +| sci:doi | string | The DOI of the data, e.g. `10.1000/xyz123`. This MUST NOT be a DOIs link. For all DOI names respective DOI links SHOULD be added to the links section (see chapter "Relation types"). | | sci:citation | string | The recommended human-readable reference (citation) to be used by publications citing the data. No specific citation style is suggested, but the citation should contain all information required to find the publication distinctively. | | sci:publications | [[Publication Object](#publication-object)] | List of relevant publications referencing and describing the data. | @@ -38,7 +38,7 @@ For Items, the fields are placed in the `properties`. For Collections, the field | Field Name | Type | Description | | ---------- | ------ | ----------- | -| doi | string | DOI of a publication referencing the data. | +| doi | string | The DOI of a publication referencing the data. This MUST NOT be a DOIs link. | | citation | string | Citation of a publication referencing the data. | **doi** - The DOI name of a publication which describes and references the data. The publications diff --git a/extensions/scientific/json-schema/schema.json b/extensions/scientific/json-schema/schema.json index 892670b32..013de86e4 100644 --- a/extensions/scientific/json-schema/schema.json +++ b/extensions/scientific/json-schema/schema.json @@ -68,7 +68,7 @@ "sci:doi": { "type": "string", "title": "Data DOI", - "pattern": "^(10[.][0-9]{4,}(?:[.][0-9]+)*/(?:(?![%\"#? ])\\S)+)$" + "pattern": "^10\\.[0-9a-zA-Z]{4,}/[^\\s]+$" }, "sci:citation": { "type": "string", @@ -83,7 +83,7 @@ "doi": { "type": "string", "title": "Publication DOI", - "pattern": "^(10[.][0-9]{4,}(?:[.][0-9]+)*/(?:(?![%\"#? ])\\S)+)$" + "pattern": "^10\\.[0-9a-zA-Z]{4,}/[^\\s]+$" }, "citation": { "type": "string",