From bd2ba8ba4a8ff99a25002cc6835b44280ee00e60 Mon Sep 17 00:00:00 2001 From: John D'Orazio Date: Wed, 11 May 2022 13:50:15 +0200 Subject: [PATCH] attempt pattern approach for URL --- nations/Europe.json | 8 +++++++- schemas/CommonDef.json | 10 +--------- schemas/WiderRegionCalendar.json | 3 +++ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/nations/Europe.json b/nations/Europe.json index e8a2c302..77c951b0 100644 --- a/nations/Europe.json +++ b/nations/Europe.json @@ -112,7 +112,13 @@ "Martyrs:For a Virgin Martyr", "Virgins:For One Virgin" ], - "readings": "" + "readings": { + "FIRST_READING": "", + "RESPONSORIAL_PSALM": "", + "SECOND_READING": "", + "ALLELUIA_VERSE": "", + "GOSPEL": "" + } }, "Metadata": { "action": "createNew", diff --git a/schemas/CommonDef.json b/schemas/CommonDef.json index 82787d76..cef7477b 100644 --- a/schemas/CommonDef.json +++ b/schemas/CommonDef.json @@ -257,15 +257,7 @@ }, "DecreeURL": { "type": "string", - "format": "uri", - "qt-uri-protocols": [ - "http", - "https" - ], - "qt-uri-extensions": [ - ".html", - ".pdf" - ], + "pattern": "^https?:\\\/\\\/(www\\.)?[a-zA-Z]{1,50}\\.[a-zA-Z]{1,6}([-a-zA-Z0-9()@:%._+~\\\/]*)\\.(html|pdf)$", "title": "DecreeURL" }, "Missals": { diff --git a/schemas/WiderRegionCalendar.json b/schemas/WiderRegionCalendar.json index 75dc96b8..1dabad07 100644 --- a/schemas/WiderRegionCalendar.json +++ b/schemas/WiderRegionCalendar.json @@ -50,6 +50,9 @@ "tag": { "type": "string" }, + "name": { + "type": "string" + }, "color": { "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor" },