From 2d3b240bea894b0667d0f6681d2ba73d947c1f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mira=20Gr=C3=BCnwald?= Date: Wed, 29 May 2019 11:39:33 +0200 Subject: [PATCH 01/18] Update Act.json --- readingdata/Act.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/readingdata/Act.json b/readingdata/Act.json index ab94679..d234746 100644 --- a/readingdata/Act.json +++ b/readingdata/Act.json @@ -67,6 +67,12 @@ "required": false, "pattern": "(\W?|[1-3])" } + }, { + "name": "act_status", + "constraints": { + "required": false, + "pattern":"(\W?|F)" + } }, { "name": "commentary", "constraints": { From 3c9be096103acea6c026b067e8130b3c930c24e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mira=20Gr=C3=BCnwald?= Date: Tue, 18 Jun 2019 12:54:31 +0200 Subject: [PATCH 02/18] Update Person.json added "narrative_age" --- readingdata/Person.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/readingdata/Person.json b/readingdata/Person.json index 4f80a2e..1e4b4fb 100644 --- a/readingdata/Person.json +++ b/readingdata/Person.json @@ -88,6 +88,12 @@ "required": false, "pattern": "(^$|NULL|S[0-9]{2}|unknown)" } + }, { + "name": "narrative_age", + "constraints": { + "required": false, + "pattern": "(^$|NULL|[0-3]|unknown)" + } }, { "name": "neibu_access", "constraints": { From 130f04f7d15139285cb4c53fe3c457e994fa3e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mira=20Gr=C3=BCnwald?= Date: Tue, 18 Jun 2019 13:59:41 +0200 Subject: [PATCH 03/18] Update readingdata/Person.json Co-Authored-By: Duncan Paterson --- readingdata/Person.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readingdata/Person.json b/readingdata/Person.json index 1e4b4fb..6b4e07e 100644 --- a/readingdata/Person.json +++ b/readingdata/Person.json @@ -92,7 +92,7 @@ "name": "narrative_age", "constraints": { "required": false, - "pattern": "(^$|NULL|[0-3]|unknown)" + "pattern": "(^$|NULL|0[0-3])" } }, { "name": "neibu_access", From 9b27c8284039e9674956dd6d40e736d3ad840b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mira=20Gr=C3=BCnwald?= Date: Wed, 19 Jun 2019 15:19:14 +0200 Subject: [PATCH 04/18] Update Person.json --- readingdata/Person.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/readingdata/Person.json b/readingdata/Person.json index 6b4e07e..21d0a90 100644 --- a/readingdata/Person.json +++ b/readingdata/Person.json @@ -121,6 +121,12 @@ "constraints": { "required": false } + }, { + "name": "character_status", + "constraints": { + "required": false, + "pattern": "(\W?|F)" + } }, { "name": "commentary", "constraints": { From 30671088898d8891e1c47374fe30d0b4584fcf58 Mon Sep 17 00:00:00 2001 From: Duncan Paterson Date: Wed, 19 Jun 2019 15:08:37 +0200 Subject: [PATCH 05/18] add missing character_status --- readingdata/Person.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readingdata/Person.json b/readingdata/Person.json index 21d0a90..72a2c64 100644 --- a/readingdata/Person.json +++ b/readingdata/Person.json @@ -125,7 +125,7 @@ "name": "character_status", "constraints": { "required": false, - "pattern": "(\W?|F)" + "pattern": "F?" } }, { "name": "commentary", From f767f48b9825e5f8845e7e4378a2b43f8835bf5a Mon Sep 17 00:00:00 2001 From: Duncan Paterson Date: Wed, 19 Jun 2019 15:21:06 +0200 Subject: [PATCH 06/18] add literary_status to PS --- readingdata/PrimarySource.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/readingdata/PrimarySource.json b/readingdata/PrimarySource.json index 758699c..1069ee4 100644 --- a/readingdata/PrimarySource.json +++ b/readingdata/PrimarySource.json @@ -85,6 +85,12 @@ "constraints": { "required": false } + }, { + "name": "literary_status", + "constraints": { + "required": false, + "pattern": "F?" + } }, { "name": "commentary", "constraints": { From d13ff6fca5a962f702617482453c3dc32f1313bb Mon Sep 17 00:00:00 2001 From: Duncan Paterson Date: Wed, 19 Jun 2019 15:22:17 +0200 Subject: [PATCH 07/18] add literary_status to SS --- readingdata/SecondarySource.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/readingdata/SecondarySource.json b/readingdata/SecondarySource.json index 68afe81..acd8901 100644 --- a/readingdata/SecondarySource.json +++ b/readingdata/SecondarySource.json @@ -85,6 +85,12 @@ "constraints": { "required": false } + }, { + "name": "literary_status", + "constraints": { + "required": false, + "pattern": "F?" + } }, { "name": "commentary", "constraints": { From 8178c70abcf854034e3ba2775e1303e7656998fd Mon Sep 17 00:00:00 2001 From: Duncan Paterson Date: Wed, 19 Jun 2019 16:19:06 +0200 Subject: [PATCH 08/18] adjust regex for determining `fictionality` --- readingdata/Act.json | 4 ++-- readingdata/Person.json | 2 +- readingdata/PrimarySource.json | 2 +- readingdata/SecondarySource.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/readingdata/Act.json b/readingdata/Act.json index d234746..3641ffe 100644 --- a/readingdata/Act.json +++ b/readingdata/Act.json @@ -68,10 +68,10 @@ "pattern": "(\W?|[1-3])" } }, { - "name": "act_status", + "name": "fictionality", "constraints": { "required": false, - "pattern":"(\W?|F)" + "pattern":"F?" } }, { "name": "commentary", diff --git a/readingdata/Person.json b/readingdata/Person.json index 72a2c64..8251949 100644 --- a/readingdata/Person.json +++ b/readingdata/Person.json @@ -122,7 +122,7 @@ "required": false } }, { - "name": "character_status", + "name": "fictionality", "constraints": { "required": false, "pattern": "F?" diff --git a/readingdata/PrimarySource.json b/readingdata/PrimarySource.json index 1069ee4..829b50a 100644 --- a/readingdata/PrimarySource.json +++ b/readingdata/PrimarySource.json @@ -86,7 +86,7 @@ "required": false } }, { - "name": "literary_status", + "name": "fictionality", "constraints": { "required": false, "pattern": "F?" diff --git a/readingdata/SecondarySource.json b/readingdata/SecondarySource.json index acd8901..e6dd1ab 100644 --- a/readingdata/SecondarySource.json +++ b/readingdata/SecondarySource.json @@ -86,7 +86,7 @@ "required": false } }, { - "name": "literary_status", + "name": "fictionality", "constraints": { "required": false, "pattern": "F?" From ed63f0ef287ddb4b44667775ed12e38ec26fc92c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mira=20Gr=C3=BCnwald?= Date: Wed, 26 Jun 2019 12:34:01 +0200 Subject: [PATCH 09/18] main_narrator and narrative_time --- readingdata/Act.json | 6 ++++++ readingdata/SecondarySource.json | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/readingdata/Act.json b/readingdata/Act.json index 3641ffe..8df191c 100644 --- a/readingdata/Act.json +++ b/readingdata/Act.json @@ -46,6 +46,12 @@ "required": false, "min-length": 4 } + }, { + "name": "narrative_time", + "constraints": { + "required": false + "min-length": 4 + } }, { "name": "substantial_discussion", "constraints": { diff --git a/readingdata/SecondarySource.json b/readingdata/SecondarySource.json index e6dd1ab..09be6a1 100644 --- a/readingdata/SecondarySource.json +++ b/readingdata/SecondarySource.json @@ -91,6 +91,12 @@ "required": false, "pattern": "F?" } + }, { + "name": "main_narrator", + "constraints": { + "required": false, + "pattern": "(P[0-9]{4}|SS[0-9]{5})" + } }, { "name": "commentary", "constraints": { From 962db13ecde906674bc8d7d4cfb8bca6609181bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mira=20Gr=C3=BCnwald?= Date: Thu, 27 Jun 2019 10:52:16 +0200 Subject: [PATCH 10/18] NarrativePosition added the schema for NarrativePosition.csv updated Readme close #4 --- README.md | 4 +++ readingdata/NarrativePosition.json | 47 ++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 readingdata/NarrativePosition.json diff --git a/README.md b/README.md index 0c4068f..56874e0 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,7 @@ to use with csvlint from inside a folder containing the csv tables. ```bash csvlint Act.csv schema=https://raw.githubusercontent.com/readchina/csv-schema/master/readingdata/Act.json ``` + +csv or schemas can be checked on this webpage: http://csvlint.io/ + +Find quick references or test regular expressions on: https://regex101.com/ diff --git a/readingdata/NarrativePosition.json b/readingdata/NarrativePosition.json new file mode 100644 index 0000000..442142e --- /dev/null +++ b/readingdata/NarrativePosition.json @@ -0,0 +1,47 @@ +{ + "fields": [{ + "name": "nar_pos_id", + "constraints": { + "required": true, + "unique": true, + "pattern": "N[0-9]{2}" + } + }, + { + "name": "nar_pos_name", + "constraints": { + "required": true + } + }, + { + "name": "created", + "constraints": { + "required": true, + "type": "http://www.w3.org/2001/XMLSchema#date" + } + }, + { + "name": "created_by", + "constraints": { + "required": true, + "pattern": "[A-Z]{2}" + } + }, + { + "name": "last_modified", + "constraints": { + "required": true, + "type": "http://www.w3.org/2001/XMLSchema#date" + } + }, + { + "name": "last_modified_by", + "constraints": { + "required": true, + "pattern": "[A-Z]{2}" + } + } + ], + "primaryKey": "nar_pos_id", + "missingValues": ["", "NULL"] +} From ecd59ccc7e1d4a48e1c26d5a2fc11b1e2f51110f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mira=20Gr=C3=BCnwald?= Date: Thu, 27 Jun 2019 11:45:49 +0200 Subject: [PATCH 11/18] updated Person.json --- readingdata/NarrativePosition.json | 6 ++++++ readingdata/Person.json | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/readingdata/NarrativePosition.json b/readingdata/NarrativePosition.json index 442142e..f1ebf4f 100644 --- a/readingdata/NarrativePosition.json +++ b/readingdata/NarrativePosition.json @@ -13,6 +13,12 @@ "required": true } }, + { + "name": "note", + "constraints": { + "required": false + } + }, { "name": "created", "constraints": { diff --git a/readingdata/Person.json b/readingdata/Person.json index 8251949..08e8e8c 100644 --- a/readingdata/Person.json +++ b/readingdata/Person.json @@ -127,6 +127,12 @@ "required": false, "pattern": "F?" } + }, { + "name": "narrative_position", + "constraints": { + "required": false, + "pattern": "(^$|NULL|N[0-9]{2}|unknown)" + } }, { "name": "commentary", "constraints": { From 48e1e01dd661835a11c1b821e7ba5f56f99069fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mira=20Gr=C3=BCnwald?= Date: Thu, 27 Jun 2019 12:36:56 +0200 Subject: [PATCH 12/18] Update SecondarySource.json --- readingdata/SecondarySource.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readingdata/SecondarySource.json b/readingdata/SecondarySource.json index 09be6a1..6b58e7e 100644 --- a/readingdata/SecondarySource.json +++ b/readingdata/SecondarySource.json @@ -95,7 +95,7 @@ "name": "main_narrator", "constraints": { "required": false, - "pattern": "(P[0-9]{4}|SS[0-9]{5})" + "pattern": "(^$|P[0-9]{4}|SS[0-9]{5})" } }, { "name": "commentary", From 1c006e7a91e307d616a42004e4e68387dd56552f Mon Sep 17 00:00:00 2001 From: Duncan Paterson Date: Thu, 27 Jun 2019 14:32:30 +0200 Subject: [PATCH 13/18] fix malformed act.json see readchina/ReadingData#381 --- readingdata/Act.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readingdata/Act.json b/readingdata/Act.json index 8df191c..ce39096 100644 --- a/readingdata/Act.json +++ b/readingdata/Act.json @@ -49,7 +49,7 @@ }, { "name": "narrative_time", "constraints": { - "required": false + "required": false, "min-length": 4 } }, { From 608dfb34116cf2a3176a40ad861d8ba0f7744ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mira=20Gr=C3=BCnwald?= Date: Sun, 7 Jul 2019 19:32:03 +0200 Subject: [PATCH 14/18] adjustments changed the schema for narrative_time, narrative_status and main narrator. added a column for the external link of the narrative positions --- readingdata/Act.json | 3 ++- readingdata/NarrativePosition.json | 6 ++++++ readingdata/Person.json | 4 ++-- readingdata/SecondarySource.json | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/readingdata/Act.json b/readingdata/Act.json index ce39096..4457349 100644 --- a/readingdata/Act.json +++ b/readingdata/Act.json @@ -50,7 +50,8 @@ "name": "narrative_time", "constraints": { "required": false, - "min-length": 4 + "min-length": 2, + "pattern": "(^$|NULL|0[0-3])" } }, { "name": "substantial_discussion", diff --git a/readingdata/NarrativePosition.json b/readingdata/NarrativePosition.json index f1ebf4f..d119063 100644 --- a/readingdata/NarrativePosition.json +++ b/readingdata/NarrativePosition.json @@ -19,6 +19,12 @@ "required": false } }, + { + "name": "source_link", + "constraints": { + "required": false + } + }, { "name": "created", "constraints": { diff --git a/readingdata/Person.json b/readingdata/Person.json index 08e8e8c..d6c93e5 100644 --- a/readingdata/Person.json +++ b/readingdata/Person.json @@ -128,10 +128,10 @@ "pattern": "F?" } }, { - "name": "narrative_position", + "name": "narrative_status", "constraints": { "required": false, - "pattern": "(^$|NULL|N[0-9]{2}|unknown)" + "pattern": "(^$|NULL|N[0-9]{2}|S[0-9]{2}|unknown)" } }, { "name": "commentary", diff --git a/readingdata/SecondarySource.json b/readingdata/SecondarySource.json index 6b58e7e..e0dbd8c 100644 --- a/readingdata/SecondarySource.json +++ b/readingdata/SecondarySource.json @@ -95,7 +95,7 @@ "name": "main_narrator", "constraints": { "required": false, - "pattern": "(^$|P[0-9]{4}|SS[0-9]{5})" + "pattern": "(^$|P[0-9]{4}|SS[0-9]{5}|I[0-9]{4})" } }, { "name": "commentary", From a8b2b2ee4db96397a6d5ad7a95f9dfc0fcaecf53 Mon Sep 17 00:00:00 2001 From: duncdrum Date: Sat, 12 Oct 2019 22:14:01 +0200 Subject: [PATCH 15/18] fix(NarPos): source --- readingdata/NarrativePosition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readingdata/NarrativePosition.json b/readingdata/NarrativePosition.json index d119063..cb29047 100644 --- a/readingdata/NarrativePosition.json +++ b/readingdata/NarrativePosition.json @@ -20,7 +20,7 @@ } }, { - "name": "source_link", + "name": "source", "constraints": { "required": false } From 26deaa2ba9a34c5d2e2fcdcc0fb69875bb0e138b Mon Sep 17 00:00:00 2001 From: duncdrum Date: Sun, 13 Oct 2019 12:02:31 +0200 Subject: [PATCH 16/18] fix(person): narrative_age --- readingdata/Person.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readingdata/Person.json b/readingdata/Person.json index d6c93e5..64784f1 100644 --- a/readingdata/Person.json +++ b/readingdata/Person.json @@ -92,7 +92,7 @@ "name": "narrative_age", "constraints": { "required": false, - "pattern": "(^$|NULL|0[0-3])" + "pattern": "(^$|NULL|[0-3])" } }, { "name": "neibu_access", From df6c2e47eaaddf73ae97bc06ff3097fceaf45bcc Mon Sep 17 00:00:00 2001 From: duncdrum Date: Sun, 13 Oct 2019 12:36:51 +0200 Subject: [PATCH 17/18] fix(act): narrative_time --- readingdata/Act.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readingdata/Act.json b/readingdata/Act.json index 4457349..d007709 100644 --- a/readingdata/Act.json +++ b/readingdata/Act.json @@ -51,7 +51,7 @@ "constraints": { "required": false, "min-length": 2, - "pattern": "(^$|NULL|0[0-3])" + "pattern": "(^$|NULL|[0-3])" } }, { "name": "substantial_discussion", From 93fddfc062deadd30ebc0abe0c6f9478b48b798d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mira=20Gr=C3=BCnwald?= Date: Fri, 28 Feb 2020 14:00:24 +0100 Subject: [PATCH 18/18] Update Quotation.json added Artwork as possible source of quotations see #420 --- readingdata/Quotation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readingdata/Quotation.json b/readingdata/Quotation.json index bb9c044..bc7bccb 100644 --- a/readingdata/Quotation.json +++ b/readingdata/Quotation.json @@ -17,7 +17,7 @@ "name": "source", "constraints": { "required": true, - "pattern": "(P|S)S[0-9]{5}" + "pattern": "(P|S)S[0-9]{5}|AW[0-9]{5}" } }, {