attempt pattern approach for URL

Liturgical-Calendar · May 11, 2022 · bd2ba8b · bd2ba8b
1 parent a9ac10e
commit bd2ba8b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git 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
@@ -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
@@ -50,6 +50,9 @@
                 "tag": {
                     "type": "string"
                 },
+                "name": {
+                    "type": "string"
+                },
                 "color": {
                     "$ref": "https://litcal.org/api/dev/schemas/CommonDef.json#/definitions/LitColor"
                 },