closes #2

D-PLACE · Nov 23, 2023 · f2116b8 · f2116b8
1 parent a21c1f8
commit f2116b8
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 70 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,4 +12,5 @@ datasets independently.
 - Corrected location of Barabra (SCCS39)
 - Corrected name of Chekiang (SCCS114)
 - Updated HRAF mappings according to HRAF's Cross Cultural Concordance
+- Fixed code labels for SCCS713
 
diff --git a/cldf/README.md b/cldf/README.md
@@ -13,7 +13,7 @@ property | value
 [dc:identifier](http://purl.org/dc/terms/identifier) | https://escholarship.org/uc/item/62c5c02n
 [dc:license](http://purl.org/dc/terms/license) | https://creativecommons.org/licenses/by-nc/4.0/
 [dcat:accessURL](http://www.w3.org/ns/dcat#accessURL) | https://github.com/D-PLACE/dplace-dataset-sccs
-[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) | <ol><li><a href="https://hraf.yale.edu/cross-cultural-concordance/">HRAF Cross Cultural Concordance 2020</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-sccs/tree/b64e3ab">D-PLACE/dplace-dataset-sccs b64e3ab</a></li><li><a href="https://github.com/glottolog/glottolog/tree/v4.8">Glottolog v4.8</a></li></ol>
+[prov:wasDerivedFrom](http://www.w3.org/ns/prov#wasDerivedFrom) | <ol><li><a href="https://hraf.yale.edu/cross-cultural-concordance/">HRAF Cross Cultural Concordance 2020</a></li><li><a href="https://github.com/D-PLACE/dplace-dataset-sccs/tree/a21c1f8">D-PLACE/dplace-dataset-sccs a21c1f8</a></li><li><a href="https://github.com/glottolog/glottolog/tree/v4.8">Glottolog v4.8</a></li></ol>
 [prov:wasGeneratedBy](http://www.w3.org/ns/prov#wasGeneratedBy) | <ol><li><strong>python</strong>: 3.10.12</li><li><strong>python-packages</strong>: <a href="./requirements.txt">requirements.txt</a></li></ol>
 [rdf:ID](http://www.w3.org/1999/02/22-rdf-syntax-ns#ID) | dplace-dataset-sccs
 [rdf:type](http://www.w3.org/1999/02/22-rdf-syntax-ns#type) | http://www.w3.org/ns/dcat#Distribution

diff --git a/cldf/StructureDataset-metadata.json b/cldf/StructureDataset-metadata.json
@@ -23,7 +23,7 @@
         {
             "rdf:about": "https://github.com/D-PLACE/dplace-dataset-sccs",
             "rdf:type": "prov:Entity",
-            "dc:created": "b64e3ab",
+            "dc:created": "a21c1f8",
             "dc:title": "Repository"
         },
         {

diff --git a/cldf/codes.csv b/cldf/codes.csv
@@ -4583,9 +4583,9 @@ SCCS712-1,SCCS712,No items present,No items present,1
 SCCS712-2,SCCS712,One or two items present,One or two item present,2
 SCCS712-3,SCCS712,Three of four items present,Three of four items present,3
 SCCS713-NA,SCCS713,NA,Missing data,99
-SCCS713-1,SCCS713,Preclassical,"Classical religion (Xianity, Islam, Hinduism, Buddhism)",1
+SCCS713-1,SCCS713,"Classical religion (Xianity, Islam, Hinduism, Buddhism)",Classical,1
 SCCS713-2,SCCS713,Mixture of classical & preclassical,Mixture of classical and preclassical,2
-SCCS713-3,SCCS713,"Classical religion (Xianity, Islam, Hinduism, Buddhism)",Preclassical,3
+SCCS713-3,SCCS713,Preclassical religion,Preclassical,3
 SCCS714-NA,SCCS714,NA,Missing data,99
 SCCS714-1,SCCS714,Female excess,Female excess,1
 SCCS714-2,SCCS714,Roughly equal,Roughly equal,2

diff --git a/cldf/data.csv b/cldf/data.csv
diff --git a/cldfbench_sccs.py b/cldfbench_sccs.py
@@ -10,8 +10,6 @@ class Dataset(DatasetWithSocieties):
     def local_makecldf(self, args):
         ehraf = {'SCCS' + row['SCCS ID']: (row['eHRAF ID'], row['eHRAF Name']) for row in self.etc_dir.read_csv('ehraf-ccr.csv', dicts=True) if row['SCCS ID'] != 'None'}
         for row in args.writer.objects['LanguageTable']:
-            if row['HRAF_ID'] and row['HRAF_ID'] != ehraf[row['ID']][0]:
-                print(ehraf[row['ID']], row['HRAF_ID'])
             row['HRAF_ID'] = ehraf[row['ID']][0]
             row['HRAF_name_ID'] = '{} ({})'.format(ehraf[row['ID']][1], ehraf[row['ID']][0])
 

diff --git a/raw/codes.csv b/raw/codes.csv
@@ -4583,9 +4583,9 @@ SCCS712,1,No items present,No items present
 SCCS712,2,One or two item present,One or two items present
 SCCS712,3,Three of four items present,Three of four items present
 SCCS713,NA,Missing data,NA
-SCCS713,1,"Classical religion (Xianity, Islam, Hinduism, Buddhism)",Preclassical
+SCCS713,1,Classical,"Classical religion (Xianity, Islam, Hinduism, Buddhism)"
 SCCS713,2,Mixture of classical and preclassical,Mixture of classical & preclassical
-SCCS713,3,Preclassical,"Classical religion (Xianity, Islam, Hinduism, Buddhism)"
+SCCS713,3,Preclassical,Preclassical religion
 SCCS714,NA,Missing data,NA
 SCCS714,1,Female excess,Female excess
 SCCS714,2,Roughly equal,Roughly equal