Skip to content

Commit

Permalink
fix(Person, Soc_rel): key validation for work
Browse files Browse the repository at this point in the history 
see #462
  • Loading branch information
@duncdrum
duncdrum committed Jun 7, 2021
1 parent 3c53916 commit 37da4d3
Show file tree
Hide file tree
Showing 9 changed files with 104 additions and 85 deletions.
57 changes: 29 additions & 28 deletions csv/data/Agent.csv
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,4 @@
agent_id,old_id,language,commentary,note,created,created_by,last_modified,last_modified_by
AG0627,I0001,en,,,2020-04-02,DP,2020-04-02,DP
AG0628,I0002,en,,,2020-04-02,DP,2020-04-02,DP
AG0629,I0003,en,,,2020-04-02,DP,2020-04-02,DP
AG0630,I0004,en,,,2020-04-02,DP,2020-04-02,DP
AG0631,I0005,en,,,2020-04-02,DP,2020-04-02,DP
AG0632,I0006,en,Nanjing University,,2020-04-02,DP,2020-04-02,DP
AG0633,I0007,en,,,2020-04-02,DP,2020-04-02,DP
AG0634,I0008,en,,,2020-04-02,DP,2020-04-02,DP
AG0635,I0009,en,,,2020-04-02,DP,2020-04-02,DP
AG0636,I0010,en,,,2020-04-02,DP,2020-04-02,DP
AG0637,I0100,en,,,2020-04-02,DP,2020-04-02,DP
AG0638,I0101,en,It was reorganized by 湖北省实验歌剧团 and 湖北民间歌舞团.,,2020-04-02,DP,2020-04-02,DP
AG0639,I0102,en,,,2020-04-02,DP,2020-04-02,DP
AG0640,I0103,en,,,2020-04-02,DP,2020-04-02,DP
AG0641,I0104,en,,,2020-04-02,DP,2020-04-02,DP
AG0642,I0105,en,,,2020-04-02,DP,2020-04-02,DP
AG0643,I0106,en,,,2020-04-02,DP,2020-04-02,DP
AG0644,I0107,en,,,2020-04-02,DP,2020-04-02,DP
AG0645,I0108,en,,,2020-04-02,DP,2020-04-02,DP
AG0646,I0109,en,,,2020-04-02,DP,2020-04-02,DP
AG0647,I0110,en,,,2020-04-02,DP,2020-04-02,DP
AG0648,I0111,en,,,2020-04-02,DP,2020-04-02,DP
AG0649,I0112,en,,,2020-04-02,DP,2020-04-02,DP
AG0650,I0113,en,,,2020-04-02,DP,2020-04-02,DP
AG0651,I0114,en,,,2020-04-02,DP,2020-04-02,DP
AG0652,I0115,en,,,2020-04-02,DP,2020-04-02,DP
AG0653,I0116,en,,,2020-04-02,DP,2020-04-02,DP
AG0654,I0117,en,,,2020-04-02,DP,2020-04-02,DP
AG0001,P0001,en,,,2020-04-02,DP,2020-04-02,DP
AG0002,P0002,en,,,2020-04-02,DP,2020-04-02,DP
AG0003,P0003,en,张仃的儿子 . 母亲陈布文，姐姐陈乔乔、大哥张耿军、弟弟张大伟、张寥寥、张沛沛。,,2020-04-02,DP,2020-04-02,DP
Expand Down Expand Up @@ -653,5 +625,34 @@ AG0623,P0901,en,Part of a group mentioned by AG0613,,2020-04-02,DP,2020-04-02,DP
AG0624,P0902,en,Part of a group mentioned by AG0613,,2020-04-02,DP,2020-04-02,DP
AG0625,P0903,en,,,2020-04-02,DP,2020-04-02,DP
AG0626,P0999,en,,,2020-04-02,DP,2020-04-02,DP
AG0627,I0001,en,,,2020-04-02,DP,2020-04-02,DP
AG0628,I0002,en,,,2020-04-02,DP,2020-04-02,DP
AG0629,I0003,en,,,2020-04-02,DP,2020-04-02,DP
AG0630,I0004,en,,,2020-04-02,DP,2020-04-02,DP
AG0631,I0005,en,,,2020-04-02,DP,2020-04-02,DP
AG0632,I0006,en,Nanjing University,,2020-04-02,DP,2020-04-02,DP
AG0633,I0007,en,,,2020-04-02,DP,2020-04-02,DP
AG0634,I0008,en,,,2020-04-02,DP,2020-04-02,DP
AG0635,I0009,en,,,2020-04-02,DP,2020-04-02,DP
AG0636,I0010,en,,,2020-04-02,DP,2020-04-02,DP
AG0637,I0100,en,,,2020-04-02,DP,2020-04-02,DP
AG0638,I0101,en,It was reorganized by 湖北省实验歌剧团 and 湖北民间歌舞团.,,2020-04-02,DP,2020-04-02,DP
AG0639,I0102,en,,,2020-04-02,DP,2020-04-02,DP
AG0640,I0103,en,,,2020-04-02,DP,2020-04-02,DP
AG0641,I0104,en,,,2020-04-02,DP,2020-04-02,DP
AG0642,I0105,en,,,2020-04-02,DP,2020-04-02,DP
AG0643,I0106,en,,,2020-04-02,DP,2020-04-02,DP
AG0644,I0107,en,,,2020-04-02,DP,2020-04-02,DP
AG0645,I0108,en,,,2020-04-02,DP,2020-04-02,DP
AG0646,I0109,en,,,2020-04-02,DP,2020-04-02,DP
AG0647,I0110,en,,,2020-04-02,DP,2020-04-02,DP
AG0648,I0111,en,,,2020-04-02,DP,2020-04-02,DP
AG0649,I0112,en,,,2020-04-02,DP,2020-04-02,DP
AG0650,I0113,en,,,2020-04-02,DP,2020-04-02,DP
AG0651,I0114,en,,,2020-04-02,DP,2020-04-02,DP
AG0652,I0115,en,,,2020-04-02,DP,2020-04-02,DP
AG0653,I0116,en,,,2020-04-02,DP,2020-04-02,DP
AG0654,I0117,en,,,2020-04-02,DP,2020-04-02,DP
AG0655,,en,Beijing University,,2020-12-23,MG,2020-12-23,MG
AG0656,,en,Xinhua Bookstore,,2020-12-23,MG,2020-12-23,MG
AG1000,,en,,,2021-06-07,DP,2021-06-07,DP
61 changes: 31 additions & 30 deletions csv/data/Person.csv
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions csv/data/SecondarySource.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,3 +208,4 @@ W0528,Me before and after the 'April Fifth Events',,en,G03,SP0436,,,,,W0431,,20
W0528,我在’四五事件‘前后,,zh,G03,SP0436,,,,,W0431,,203-233,,2018-11-06,WH,2020-04-08,DP
W0528,Wo zai siwu shijian qianhou,,zh-Latn-pinyin,G03,SP0436,,,,,W0431,,203-233,,2018-11-06,WH,2020-04-08,DP
W0529,The Most Wanted Man in China,My Journey from Scientist to Enemy of the State,en,G03,SP0053,2016,Henry Holt,,,,,,,2019-02-19,LH,2020-04-08,DP
W1001,Dictionary of Pseudonyms, 13000 Assumed Names and Their Origins 5th ed.,en,G57,SP1000,2010,McFarland,,,,,,,2021-06-07,DP,2021-06-07,DP
3 changes: 2 additions & 1 deletion csv/data/SocialPosition.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
soc_pos_id,soc_pos_name,created,created_by,last_modified,last_modified_by
S00,unkown,2021-06-07,DP,2021-06-07,DP
S01,higher cadre,2017-07-08,OS,2017-07-08,OS
S02,lower cadre,2017-07-08,OS,2017-07-08,OS
S03,intellectual,2017-07-08,OS,2017-07-08,OS
Expand All @@ -7,4 +8,4 @@ S05,high-ranking military officer,2017-07-09,OS,2017-07-09,OS
S06,middle class,2017-07-08,OS,2017-07-08,OS
S07,worker,2017-07-08,OS,2017-07-08,OS
S08,peasant,2017-07-08,OS,2017-07-08,OS
S09,common soldier,2017-07-09,OS,2018-11-13,MG
S09,common soldier,2017-07-09,OS,2018-11-13,MG
4 changes: 2 additions & 2 deletions csv/data/SocialRelation.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
soc_rel_id,ego,related,relation,rel_zh,rel_en,source,page,note,created,created_by,last_modified,last_modified_by
SR00001,AG0003,AG0446,S4.1.1m,父亲,father,http://focus.news.163.com/10/0410/10/63TE57DT00011SM9_all.html,ONLINE SOURCE,,2018-01-26,OS,2020-04-04,DP
SR00001,AG0003,AG0446,S4.1.1m,父亲,father,W1000,ONLINE SOURCE,,2018-01-26,OS,2020-04-04,DP
SR00002,AG0197,AG0205,S3.1,熟人,acquaintance,W0490,249,,2018-02-02,OS,2020-04-04,DP
SR00003,AG0197,AG0206,S3.1,熟人,acquaintance,W0490,249,,2018-02-02,OS,2020-04-04,DP
SR00004,AG0037,AG0035,S4.1.2.1f,母亲,mother,W0445,ONLINE SOURCE,,2018-02-15,OS,2020-04-04,DP
Expand All @@ -26,4 +26,4 @@ SR00024,AG0298,AG0291,S3.1,熟人,acquaintance,W0513,188,,2018-04-03,MG,2020-04-
SR00025,AG0291,AG0307,S4.2.1.2my,弟弟,younger brother,W0513,9,,2018-04-06,MG,2020-04-04,DP
SR00026,AG0031,AG0032,S3.2-,朋友,friend,W0436,ONLINE SOURCE,They got to know each other in prison,2018-05-14,MG,2020-04-04,DP
SR00027,AG0242,AG0433,S4.3.2.1f,妻子,wife,W0500,,,2018-07-17,MG,2020-04-04,DP
SR00028,AG0166,AG0448,S4.2.1.1me,哥哥,elder brother,https://books.google.de/books?id=eSIhzKnNUf4C&pg=PA240&lpg=PA240&dq=elena+ilyina+1901-1964&source=bl&ots=C7IJD8ueqI&sig=GtUlXr5R2PLUSj1EJJEAMHEIY_A&hl=en&sa=X&ved=2ahUKEwj_yIvp1efcAhXJCuwKHS0OBh0Q6AEwCXoECAgQAQ#v=onepage&q=elena%20ilyina%201901-1964&f=false,ONLINE SOURCE,,2018-08-12,MG,2020-04-04,DP
SR00028,AG0166,AG0448,S4.2.1.1me,哥哥,elder brother,W1001,240,,2018-08-12,MG,2020-04-04,DP
2 changes: 2 additions & 0 deletions csv/data/Space.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,3 +449,5 @@ SP0447,,Tian'anmen Square,L,en,39.9042,116.407396,,2021-01-05,MG,2021-01-05,MG
SP0448,,Three Gorges Dam,L,en,30.813290,111.014292,,2021-01-05,MG,2021-01-12,MG
SP0449,,Bolivia,PL,en,-16.290154,-63.588654,,2021-01-05,MG,2021-01-12,MG
SP0450,,Qingdao,PL,en,36.091930,120.328056,,2021-01-09,MG,2021-01-09,MG
SP1000,,Jefferson,PL,en,36.42,-81.468889,,2021-06-07,DP,2021-06-07,DP
SP1001,,Melksham,PL,en, 51.371,-2.138,,2021-06-07,DP,2021-06-07,DP
2 changes: 2 additions & 0 deletions csv/data/Work.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -640,3 +640,5 @@ W0638,AW00181,AG0626,AW,181,en,Translated by project member.,,2019-02-25,WH,2020
W0639,AW00094,AG0407,AW,94,cs,,,2019-08-21,MG,2020-04-05,DP
W0700,,AG0371,PS,,en,,,2021-02-23,MG,2021-02-23,MG
W0701,,AG0626,PS,,en,,,2021-02-23,MG,2021-02-23,MG
W1000,,AG0626,SS,,zh,http://focus.news.163.com/10/0410/10/63TE57DT00011SM9_all.html,403,2018-01-26,OS,2021-06-07,DP
W1001,,AG1000,SS,,zh,https://books.google.de/books?id=eSIhzKnNUf4C&pg=PA240&lpg=PA240&dq=elena+ilyina+1901-1964&source=bl&ots=C7IJD8ueqI&sig=GtUlXr5R2PLUSj1EJJEAMHEIY_A&hl=en&sa=X&ved=2ahUKEwj_yIvp1efcAhXJCuwKHS0OBh0Q6AEwCXoECAgQAQ#v=onepage&q=elena%20ilyina%201901-1964&f=false,403,2018-08-12,MG,2021-06-07,DP
52 changes: 35 additions & 17 deletions csv/datapackage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"homepage": "https://readchina.github.io/",
"version": "1.0.0-BETA",
"id": "https://doi.org/10.5281/zenodo.3755105",
"contributors": [{
"contributors": [
{
"title": "Lena Henningsen",
"role": "author"
},
Expand All @@ -14,12 +15,15 @@
"role": "author"
}
],
"licenses": [{
"name": "CC-BY-SA-4.0",
"title": "Creative Commons Attribution Share-Alike 4.0",
"path": "https://creativecommons.org/licenses/by-sa/4.0/"
}],
"resources": [{
"licenses": [
{
"name": "CC-BY-SA-4.0",
"title": "Creative Commons Attribution Share-Alike 4.0",
"path": "https://creativecommons.org/licenses/by-sa/4.0/"
}
],
"resources": [
{
"name": "act",
"schema": "schema/Act.json",
"path": "data/Act.csv",
Expand Down Expand Up @@ -182,7 +186,8 @@
"profile": "tabular-data-resource"
}
],
"views": [{
"views": [
{
"title": "Titles of textual works",
"resources": {
"name": "view1a",
Expand Down Expand Up @@ -262,15 +267,22 @@
"url": "https://raw.githubusercontent.com/readchina/ReadAct/master/csv/views/view02_creator-matrix.csv"
},
"specType": "vega-lite",
"spec": {
"spec": {
"$schema": "https://vega.github.io/schema/vega-lite/v4.json",
"description": "Reading Objects by creator excluding anonymous works",
"data": {
"url": "https://raw.githubusercontent.com/readchina/ReadAct/master/csv/views/view02_creator-matrix.csv"
},
"transform": [
{"filter": {"not": {"field": "creator", "equal": "AG0626"}}}
],
{
"filter": {
"not": {
"field": "creator",
"equal": "AG0626"
}
}
}
],
"mark": {
"type": "bar"
},
Expand All @@ -293,10 +305,16 @@
"field": "act_object",
"type": "nominal"
},
"tooltip": [
{"field": "title"},
{"field": "name"},
{"aggregate": "count"}
"tooltip": [
{
"field": "title"
},
{
"field": "name"
},
{
"aggregate": "count"
}
]
}
}
Expand Down Expand Up @@ -573,7 +591,7 @@
}
}
}
}
}
}
]
}
}
7 changes: 0 additions & 7 deletions csv/schema/Person.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,6 @@
"fields": "soc_pos_id"
}
},
{
"fields": "source_1",
"reference": {
"resource": "work",
"fields": "work_id"
}
},
{
"fields": "name_lang",
"reference": {
Expand Down

0 comments on commit 37da4d3

Please sign in to comment.