From 7c8a8873d8192bb3a3cebdb4b5e202b60b938d3a Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Tue, 10 Dec 2024 11:24:22 -0500
Subject: [PATCH 1/3] fix: Update datetime definition/regex to match
 specification

---
 src/schema/objects/formats.yaml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/schema/objects/formats.yaml b/src/schema/objects/formats.yaml
index 7de4345b2d..e518936e2b 100644
--- a/src/schema/objects/formats.yaml
+++ b/src/schema/objects/formats.yaml
@@ -70,9 +70,18 @@ datetime:
   display_name: Datetime
   description: |
     A datetime in the form `"YYYY-MM-DDThh:mm:ss[.000000][Z]"`,
-    where [.000000] is an optional subsecond resolution between 1 and 6 decimal points,
-    and [Z] is an optional, valid timezone code.
-  pattern: '[0-9]{4}-[0-9]{2}-[0-9]{2}T(?:2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9](\.[0-9]{1,6})?([A-Z]{2,4})?'
+    where `[.000000]` is an optional subsecond resolution between 1 and 6 decimal points,
+    and `[Z]` is an optional literal character `Z` that indicates
+    Coordinated Universal Time (UTC).
+  pattern: "\
+    [0-9]{4}\
+    -(?:0[1-9]|1[0-2])\
+    -(?:0[1-9]|[12][0-9]|3[01])\
+    T(?:2[0-3]|[01][0-9])\
+    :[0-5][0-9]\
+    :(?:[0-5][0-9]|60)\
+    (?:\\.[0-9]{1,6})?\
+    Z?"
 file_relative:
   display_name: Path relative to the parent file
   description: |

From 91e4cf2534974df5e406c6f6c62dc2fc9b13fd34 Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Tue, 10 Dec 2024 11:34:22 -0500
Subject: [PATCH 2/3] test: Fix expected datetime patterns

---
 tools/schemacode/src/bidsschematools/tests/test_schema.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/schemacode/src/bidsschematools/tests/test_schema.py b/tools/schemacode/src/bidsschematools/tests/test_schema.py
index 6c52f0c2c1..6b1449e13e 100644
--- a/tools/schemacode/src/bidsschematools/tests/test_schema.py
+++ b/tools/schemacode/src/bidsschematools/tests/test_schema.py
@@ -85,8 +85,8 @@ def test_formats(schema_obj):
             "2022-01-05T13:16:30",
             "2022-01-05T13:16:30.5",  # subsecond resolution is allowed
             "2022-01-05T13:16:30.000005",  # up to 6 decimal points
-            "2022-01-05T13:16:30UTC",  # timezones are allowed
-            "2022-01-05T13:16:30.05UTC",
+            "2022-01-05T13:16:30Z",  # UTC indicator is allowed
+            "2022-01-05T13:16:30.05Z",
         ],
         "time": [
             "13:16:30",
@@ -133,7 +133,7 @@ def test_formats(schema_obj):
         ],
         "datetime": [
             "2022-01-05T13:16:30.1000005",  # too many decimal points
-            "2022-01-05T13:16:30U",  # time zone too short
+            "2022-01-05T13:16:30U",  # Only Z is permitted
             "2022-01-05T13:16:30UTCUTC",  # time zone too long
             "2022-01-05T34:10:10",  # invalid time
         ],

From 37dacf6d413a3626d53750dd94c042b26632f165 Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <effigies@gmail.com>
Date: Tue, 10 Dec 2024 11:55:55 -0500
Subject: [PATCH 3/3] fix: Update dicomlookup links to https

---
 src/schema/objects/metadata.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/schema/objects/metadata.yaml b/src/schema/objects/metadata.yaml
index f97f629589..fc359fd351 100644
--- a/src/schema/objects/metadata.yaml
+++ b/src/schema/objects/metadata.yaml
@@ -2899,10 +2899,10 @@ RepetitionTime:
     and the beginning of acquisition of the volume following it (TR).
     When used in the context of functional acquisitions this parameter best
     corresponds to
-    [DICOM Tag 0020, 0110](http://dicomlookup.com/dicomtags/(0020,0110)):
+    [DICOM Tag 0020, 0110](https://dicomlookup.com/dicomtags/(0020,0110)):
     the "time delta between images in a
     dynamic of functional set of images" but may also be found in
-    [DICOM Tag 0018, 0080](http://dicomlookup.com/dicomtags/(0018,0080)):
+    [DICOM Tag 0018, 0080](https://dicomlookup.com/dicomtags/(0018,0080)):
     "the period of time in msec between the beginning
     of a pulse sequence and the beginning of the succeeding
     (essentially identical) pulse sequence".
@@ -2919,7 +2919,7 @@ RepetitionTimeExcitation:
   display_name: Repetition Time Excitation
   description: |
     The interval, in seconds, between two successive excitations.
-    [DICOM Tag 0018, 0080](http://dicomlookup.com/dicomtags/(0018,0080))
+    [DICOM Tag 0018, 0080](https://dicomlookup.com/dicomtags/(0018,0080))
     best refers to this parameter.
     This field may be used together with the `"RepetitionTimePreparation"` for
     certain use cases, such as