update MCF record lifecycle dates

Author: tomkralidis

docs/content/reference/mcf.md

@@ -135,9 +135,25 @@ language_alternate|Optional|alternate language used for documenting metadata|en|
 charset|Mandatory|full name of the character coding standard used for the metadata set|utf8|ISO 19115:2003 Section B.2.1
 parentidentifier|Optional|file identifier of the metadata to which this metadata is a subset|11800c2c-e6b9-11df-b9ae-0014c2c33ebe|ISO 19115:2003 Section B.2.1
 hierarchylevel|Mandatory|level to which the metadata applies (must be one of 'series', 'software', 'featureType', 'model', 'collectionHardware', 'collectionSession', 'nonGeographicDataset', 'propertyType', 'fieldSession', 'dataset', 'service', 'attribute', 'attributeType', 'tile', 'feature', 'dimensionGroup'|dataset|ISO 19115:2003 Section B.2.1
-datestamp|Mandatory|date that the metadata was created, pygeometa supports specifying the $date$ or $datetime$ variable to update the date value at run time|2000-11-11 or 2000-01-12T11:11:11Z|ISO 19115:2003 Section B.2.1
 dataseturi|Optional|Uniformed Resource Identifier (URI) of the dataset to which the metadata applies|`urn:x-wmo:md:int.wmo.wis::http://geo.woudc.org/def/data/uv-radiation/uv-irradiance`|ISO 19115:2003 Section B.2.1
 
+#### `metadata.dates`
+
+`metadata.dates` sections (in the context of metadata record lifecycle) can have 1..n `dates` sections as required with the following object names/types:
+
+Property Name|Mandatory/Optional|Description|Example|Reference
+-------------|------------------|-----------|-------|---------:
+creation|Mandatory|record creation date|2000-09-01 or 2000-09-01T00:00:00Z|OGC API - Records - Part 1: Core, Subclause 7.2.2, Table 8
+revision|Optional|record update date|2000-09-01 or 2000-09-01T00:00:00Z|OGC API - Records - Part 1: Core, Subclause 7.2.2, Table 8
+
+```yaml
+metadata:
+    ...
+    dates:
+        creation: 2025-03-21
+        revision: 2026-11-25
+```
+
 ### `metadata.additional_identifiers`
 
 Property Name|Mandatory/Optional|Description|Example|Reference
@@ -183,13 +199,13 @@ browsegraphic|Optional|graphic that provides an illustration of the dataset|http
 
 #### `identification.dates`
 
-`identification.dates` sections can have 1..n `dates` sections as required with the following object names/types:
+`identification.dates` sections (in the context of data citation) can have 1..n `dates` sections as required with the following object names/types:
 
 Property Name|Mandatory/Optional|Description|Example|Reference
 -------------|------------------|-----------|-------|---------:
-creation|Mandatory*|'creation' reference date for the cited resource, referring to when the resource was brought into existence, *: presence of creation or publication or revision is mandatory|2000-09-01 or 2000-09-01T00:00:00Z|ISO 19115:2003 Section B.3.2.4
-publication|Optional*|'publication' reference date for the cited resource, referring to when the resource was issued, *: presence of creation or publication or revision is mandatory|2000-09-01 or 2000-09-01T00:00:00Z|ISO 19115:2003 Section B.3.2.4
-revision|Optional*|'revision' reference date for the cited resource, referring to when the resource was examined or re-examined and improved or amended, *: presence of creation or publication or revision is mandatory|2000-09-01 or 2000-09-01T00:00:00Z|ISO 19115:2003 Section B.3.2.4
+creation|Optional|'creation' reference date for the cited resource, referring to when the resource was brought into existence, *: presence of creation or publication or revision is mandatory|2000-09-01 or 2000-09-01T00:00:00Z|ISO 19115:2003 Section B.3.2.4
+publication|Optional|'publication' reference date for the cited resource, referring to when the resource was issued, *: presence of creation or publication or revision is mandatory|2000-09-01 or 2000-09-01T00:00:00Z|ISO 19115:2003 Section B.3.2.4
+revision|Optional|'revision' reference date for the cited resource, referring to when the resource was examined or re-examined and improved or amended, *: presence of creation or publication or revision is mandatory|2000-09-01 or 2000-09-01T00:00:00Z|ISO 19115:2003 Section B.3.2.4
 
 ```yaml
 identification:

pygeometa/core.py

@@ -52,7 +52,6 @@
 import os
 import pathlib
 import re
-import traceback
 from typing import IO, Union
 from xml.dom import minidom
 
@@ -369,11 +368,9 @@ def import_metadata(schema: str, metadata: str) -> dict:
             error_message = f'Import not supported for {s}'
         except Exception as err:
             error_message = f'Import failed: {err}'
-            error_trace = traceback.format_exc()
 
     if error_message is not None:
         LOGGER.warning(error_message)
-        LOGGER.debug(error_trace)
 
     return content
 

pygeometa/schemas/cwl/__init__.py

@@ -112,7 +112,7 @@ def import_(self, metadata: str) -> dict:
 
         mcf['metadata']['identifier'] = wf['id']
         mcf['metadata']['hierarchylevel'] = 'application'
-        mcf['metadata']['datestamp'] = now
+        mcf['metadata']['dates']['creation'] = now
         mcf['identification']['title'] = wf['label']
         mcf['identification']['abstract'] = wf['doc']
 

pygeometa/schemas/iso19139/__init__.py

@@ -83,7 +83,9 @@ def import_(self, metadata: str) -> dict:
             'mcf': {
                 'version': '1.0',
             },
-            'metadata': {},
+            'metadata': {
+                'dates': {}
+            },
             'spatial': {},
             'identification': {},
             'contact': {},
@@ -100,7 +102,7 @@ def import_(self, metadata: str) -> dict:
         mcf['metadata']['identifier'] = m.identifier
 
         mcf['metadata']['hierarchylevel'] = m.hierarchy
-        mcf['metadata']['datestamp'] = m.datestamp
+        mcf['metadata']['dates']['creation'] = m.datestamp
 
         LOGGER.debug('Setting language')
         if m.language:

pygeometa/schemas/iso19139/main.j2

@@ -28,7 +28,7 @@
   {% endif %}
   {% endfor %}
   <gmd:dateStamp>
-    {% set datestamp = record['metadata'].get('datestamp','')|normalize_datestring %}
+    {% set datestamp = record['metadata']['dates']['creation']|normalize_datestring %}
     {% if datestamp|length > 11 %}
     <gco:DateTime>{{ datestamp }}</gco:DateTime>
     {% else %}

pygeometa/schemas/iso19139_2/main.j2

@@ -28,7 +28,7 @@
   {% endif %}
   {% endfor %}
   <gmd:dateStamp>
-    {% set datestamp = record['metadata']['datestamp']|normalize_datestring %}
+    {% set datestamp = record['metadata']['dates']['created']|normalize_datestring %}
     {% if datestamp|length > 11 %}
     <gco:DateTime>{{ datestamp }}</gco:DateTime>
     {% else %}

pygeometa/schemas/iso19139_hnap/main.j2

@@ -28,7 +28,7 @@
   {% endif %}
   {% endfor %}
   <gmd:dateStamp>
-    {% set datestamp = record['metadata']['datestamp']|normalize_datestring %}
+    {% set datestamp = record['metadata']['dates']['creation']|normalize_datestring %}
     {% if datestamp|length > 11 %}
     <gco:DateTime>{{ datestamp }}</gco:DateTime>
     {% else %}

pygeometa/schemas/mcf/core.yaml

@@ -70,9 +70,18 @@ properties:
                     - tile
                     - feature
                     - dimensionGroup
-            datestamp:
-                $ref: '#/definitions/date_or_datetime_string'
-                description: date that the metadata was created, pygeometa supports specifying the `$date$` or `$datetime$` variable to update the date value at run time
+            dates:
+                type: object
+                description: record lifecycle dates
+                properties:
+                    creation:
+                        $ref: '#/definitions/date_or_datetime_string'
+                        format: string
+                    revision:
+                        $ref: '#/definitions/date_or_datetime_string'
+                        format: string
+                required:
+                    - creation
             dataseturi:
                 type: string
                 description: Uniform Resource Identifier (URI) of the dataset to which the metadata applies
@@ -81,7 +90,7 @@ properties:
             - language
             - charset
             - hierarchylevel
-            - datestamp
+            - dates
     spatial:
         type: object
         properties:
@@ -259,13 +268,13 @@ properties:
                 properties:
                     anyOf:
                         creation:
-                            type: '#/definitions/date_or_datetime_string'
+                            $ref: '#/definitions/date_or_datetime_string'
                             format: string
                         publication:
-                            type: '#/definitions/date_or_datetime_string'
+                            $ref: '#/definitions/date_or_datetime_string'
                             format: string
                         revision:
-                            type: '#/definitions/date_or_datetime_string'
+                            $ref: '#/definitions/date_or_datetime_string'
                             format: string
             extents:
                 type: object
@@ -358,7 +367,6 @@ properties:
             - rights
             - url
             - status
-            - dates
             - extents
             - keywords
     content_info:

pygeometa/schemas/openaire/__init__.py

@@ -86,7 +86,9 @@ def import_(self, metadata: str) -> dict:
             'mcf': {
                 'version': '1.0',
             },
-            'metadata': {},
+            'metadata': {
+                'dates': {}
+            },
             'identification': {},
             'contact': {}
         }
@@ -145,7 +147,8 @@ def import_(self, metadata: str) -> dict:
 
         date_of_collection = metadata_.get('dateOfCollection')
         if date_of_collection is not None:
-            mcf['metadata']['datestamp'] = metadata_.get('dateOfCollection')
+            mcf['metadata']['dates']['creation'] = \
+                metadata_.get('dateOfCollection')
 
         if main_instance_ is not None:
             urls = main_instance_.get('urls')
@@ -193,11 +196,10 @@ def import_(self, metadata: str) -> dict:
         e_date = metadata_.get('embargoEndDate')
         if p_date:
             dates_dict['publication'] = p_date
-            mcf['identification']['datestamp'] = [p_date]
         if e_date:
             dates_dict['embargoend'] = e_date
         if dates_dict:
-            mcf['identification']['dates'] = dates_dict
+            mcf['metadata']['dates'] = dates_dict
 
         subjects_ = metadata_.get('subjects')
         if isinstance(subjects_, dict):

pygeometa/schemas/wmo_cmp/main.j2

@@ -28,7 +28,7 @@
   {% endif %}
   {% endfor %}
   <gmd:dateStamp>
-    {% set datestamp = record['metadata']['datestamp']|normalize_datestring %}
+    {% set datestamp = record['metadata']['dates']['creation']|normalize_datestring %}
     {% if datestamp|length > 11 %}
     <gco:DateTime>{{ datestamp }}</gco:DateTime>
     {% else %}