From 18bb370f9de1f8521d9cc41fd29b02460597ff53 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Mon, 3 Nov 2025 08:33:35 -0500 Subject: [PATCH] update discovery metadata DOI definitions --- data/init/discovery-metadata/Broad-band.yml | 4 +++- data/init/discovery-metadata/Lidar.yml | 4 +++- data/init/discovery-metadata/Multi-band.yml | 4 +++- data/init/discovery-metadata/OzoneSonde.yml | 4 +++- data/init/discovery-metadata/RocketSonde.yml | 4 +++- data/init/discovery-metadata/Spectral.yml | 4 +++- data/init/discovery-metadata/TotalOzone.yml | 4 +++- data/init/discovery-metadata/Totalozoneobs.yml | 4 +++- data/init/discovery-metadata/UmkehrN14_1.yml | 6 ++++-- data/init/discovery-metadata/UmkehrN14_2.yml | 6 ++++-- .../template.yml.sample} | 4 +++- data/init/discovery-metadata/uv_index_hourly.yml | 6 ++++-- woudc_data_registry/generate_metadata.py | 5 ++++- woudc_data_registry/search.py | 4 ---- 14 files changed, 43 insertions(+), 20 deletions(-) rename data/init/{Template.yml => discovery-metadata/template.yml.sample} (97%) diff --git a/data/init/discovery-metadata/Broad-band.yml b/data/init/discovery-metadata/Broad-band.yml index 9681582b..3e11034c 100644 --- a/data/init/discovery-metadata/Broad-band.yml +++ b/data/init/discovery-metadata/Broad-band.yml @@ -3,6 +3,9 @@ mcf: metadata: identifier: Broad-band + additional_identifiers: + - identifier: 10.14287/10000012 + scheme: https://doi.org language: en language_alternate: fr charset: utf8 @@ -27,7 +30,6 @@ identification: creation: 2025-04-30 publication: 2025-04-30 wmo_data_policy: core - doi: 10.14287/10000012 keywords: default: keywords: diff --git a/data/init/discovery-metadata/Lidar.yml b/data/init/discovery-metadata/Lidar.yml index 666f15cf..5a59c572 100644 --- a/data/init/discovery-metadata/Lidar.yml +++ b/data/init/discovery-metadata/Lidar.yml @@ -3,6 +3,9 @@ mcf: metadata: identifier: Lidar + additional_identifiers: + - identifier: 10.14287/10000007 + scheme: https://doi.org language: en language_alternate: fr charset: utf8 @@ -27,7 +30,6 @@ identification: creation: 2025-04-30 publication: 2025-04-30 wmo_data_policy: core - doi: 10.14287/10000007 keywords: default: keywords: diff --git a/data/init/discovery-metadata/Multi-band.yml b/data/init/discovery-metadata/Multi-band.yml index e54a294e..7c45a097 100644 --- a/data/init/discovery-metadata/Multi-band.yml +++ b/data/init/discovery-metadata/Multi-band.yml @@ -3,6 +3,9 @@ mcf: metadata: identifier: Multi-band + additional_identifiers: + - identifier: 10.14287/10000010 + scheme: https://doi.org language: en language_alternate: fr charset: utf8 @@ -27,7 +30,6 @@ identification: creation: 2025-04-30 publication: 2025-04-30 wmo_data_policy: core - doi: 10.14287/10000010 keywords: default: keywords: diff --git a/data/init/discovery-metadata/OzoneSonde.yml b/data/init/discovery-metadata/OzoneSonde.yml index 7c290b64..c3abcdfb 100644 --- a/data/init/discovery-metadata/OzoneSonde.yml +++ b/data/init/discovery-metadata/OzoneSonde.yml @@ -3,6 +3,9 @@ mcf: metadata: identifier: OzoneSonde + additional_identifiers: + - identifier: 10.14287/10000008 + scheme: https://doi.org language: en language_alternate: fr charset: utf8 @@ -27,7 +30,6 @@ identification: creation: 2025-04-30 publication: 2025-04-30 wmo_data_policy: core - doi: 10.14287/10000008 keywords: default: keywords: diff --git a/data/init/discovery-metadata/RocketSonde.yml b/data/init/discovery-metadata/RocketSonde.yml index 46b4c00c..16f2b473 100644 --- a/data/init/discovery-metadata/RocketSonde.yml +++ b/data/init/discovery-metadata/RocketSonde.yml @@ -3,6 +3,9 @@ mcf: metadata: identifier: RocketSonde + additional_identifiers: + - identifier: 10.14287/10000009 + scheme: https://doi.org language: en language_alternate: fr charset: utf8 @@ -27,7 +30,6 @@ identification: creation: 2025-04-30 publication: 2025-04-30 wmo_data_policy: core - doi: 10.14287/10000009 keywords: default: keywords: diff --git a/data/init/discovery-metadata/Spectral.yml b/data/init/discovery-metadata/Spectral.yml index 37794952..18c8400c 100644 --- a/data/init/discovery-metadata/Spectral.yml +++ b/data/init/discovery-metadata/Spectral.yml @@ -3,6 +3,9 @@ mcf: metadata: identifier: Spectral + additional_identifiers: + - identifier: 10.14287/10000011 + scheme: https://doi.org language: en language_alternate: fr charset: utf8 @@ -28,7 +31,6 @@ identification: creation: 2025-04-30 publication: 2025-04-30 wmo_data_policy: core - doi: 10.14287/10000011 keywords: default: keywords: diff --git a/data/init/discovery-metadata/TotalOzone.yml b/data/init/discovery-metadata/TotalOzone.yml index f467f534..1e8c76f9 100644 --- a/data/init/discovery-metadata/TotalOzone.yml +++ b/data/init/discovery-metadata/TotalOzone.yml @@ -3,6 +3,9 @@ mcf: metadata: identifier: TotalOzone + additional_identifiers: + - identifier: 10.14287/10000004 + scheme: https://doi.org language: en language_alternate: fr charset: utf8 @@ -27,7 +30,6 @@ identification: creation: 2025-04-30 publication: 2025-04-30 wmo_data_policy: core - doi: 10.14287/10000004 keywords: default: keywords: diff --git a/data/init/discovery-metadata/Totalozoneobs.yml b/data/init/discovery-metadata/Totalozoneobs.yml index 46c2894a..1710201e 100644 --- a/data/init/discovery-metadata/Totalozoneobs.yml +++ b/data/init/discovery-metadata/Totalozoneobs.yml @@ -3,6 +3,9 @@ mcf: metadata: identifier: TotalOzoneObs + additional_identifiers: + - identifier: 10.14287/10000003 + scheme: https://doi.org language: en language_alternate: fr charset: utf8 @@ -27,7 +30,6 @@ identification: creation: 2025-04-30 publication: 2025-04-30 wmo_data_policy: core - doi: 10.14287/10000003 keywords: default: keywords: diff --git a/data/init/discovery-metadata/UmkehrN14_1.yml b/data/init/discovery-metadata/UmkehrN14_1.yml index 9d4bbfc2..2b429366 100644 --- a/data/init/discovery-metadata/UmkehrN14_1.yml +++ b/data/init/discovery-metadata/UmkehrN14_1.yml @@ -3,6 +3,9 @@ mcf: metadata: identifier: UmkehrN14_1.0 + additional_identifiers: + - identifier: 10.14287/10000005 + scheme: https://doi.org language: en language_alternate: fr charset: utf8 @@ -27,7 +30,6 @@ identification: creation: 2025-04-30 publication: 2025-04-30 wmo_data_policy: core - doi: 10.14287/10000005 keywords: default: keywords: @@ -114,4 +116,4 @@ distribution: description: en: *abstract_en fr: *abstract_fr - function: download \ No newline at end of file + function: download diff --git a/data/init/discovery-metadata/UmkehrN14_2.yml b/data/init/discovery-metadata/UmkehrN14_2.yml index 81c4a037..49895367 100644 --- a/data/init/discovery-metadata/UmkehrN14_2.yml +++ b/data/init/discovery-metadata/UmkehrN14_2.yml @@ -3,6 +3,9 @@ mcf: metadata: identifier: UmkehrN14_2.0 + additional_identifiers: + - identifier: 10.14287/10000006 + scheme: https://doi.org language: en language_alternate: fr charset: utf8 @@ -27,7 +30,6 @@ identification: creation: 2025-04-30 publication: 2025-04-30 wmo_data_policy: core - doi: 10.14287/10000006 keywords: default: keywords: @@ -114,4 +116,4 @@ distribution: description: en: *abstract_en fr: *abstract_fr - function: download \ No newline at end of file + function: download diff --git a/data/init/Template.yml b/data/init/discovery-metadata/template.yml.sample similarity index 97% rename from data/init/Template.yml rename to data/init/discovery-metadata/template.yml.sample index 9a134878..894a9f2e 100644 --- a/data/init/Template.yml +++ b/data/init/discovery-metadata/template.yml.sample @@ -5,6 +5,9 @@ mcf: # fixed except for identifier metadata: identifier: totalozone + additional_identifiers: + - identifier: 10.14287/10000004 + scheme: https://doi.org language: en language_alternate: fr charset: utf8 @@ -30,7 +33,6 @@ identification: creation: 2025-04-30 publication: 2025-04-30 wmo_data_policy: core # fixed - doi: 10.14287/10000004 # doi keywords: default: keywords: diff --git a/data/init/discovery-metadata/uv_index_hourly.yml b/data/init/discovery-metadata/uv_index_hourly.yml index 81a602dd..37e0b912 100644 --- a/data/init/discovery-metadata/uv_index_hourly.yml +++ b/data/init/discovery-metadata/uv_index_hourly.yml @@ -3,6 +3,9 @@ mcf: metadata: identifier: uv_index_hourly + additional_identifiers: + - identifier: 10.14287/10000013 + scheme: https://doi.org language: en language_alternate: fr charset: utf8 @@ -27,7 +30,6 @@ identification: creation: 2025-04-30 publication: 2025-04-30 wmo_data_policy: core - doi: 10.14287/10000013 keywords: default: keywords: @@ -102,4 +104,4 @@ distribution: description: en: *abstract_en fr: *abstract_fr - function: download \ No newline at end of file + function: download diff --git a/woudc_data_registry/generate_metadata.py b/woudc_data_registry/generate_metadata.py index 5076e4ba..2e0369ac 100644 --- a/woudc_data_registry/generate_metadata.py +++ b/woudc_data_registry/generate_metadata.py @@ -123,7 +123,10 @@ def generate_metadata(woudc_yaml): value2['description_en'] dataset_md['properties']['abstract_fr'] = \ value2['description_fr'] - dataset_md["properties"]['doi'] = value2['doi'] + dataset_md["properties"]['externalIds'] = [{ + 'value': value2['doi'], + 'scheme': 'https://doi.org' + }] dataset_md['properties']['keywords_en'] = \ value2['keywords_en'] dataset_md['properties']['keywords_fr'] = \ diff --git a/woudc_data_registry/search.py b/woudc_data_registry/search.py index b462e7a5..6c9db475 100644 --- a/woudc_data_registry/search.py +++ b/woudc_data_registry/search.py @@ -226,10 +226,6 @@ 'fields': {'raw': typedefs['keyword']} }, 'dataset_snapshots': dataset_links, - 'doi': { - 'type': 'text', - 'fields': {'raw': typedefs['keyword']} - }, 'keywords': { 'type': 'text', 'fields': {'raw': typedefs['keyword']}