DATA: Final Type

dwhieb · Jun 9, 2024 · a6e10ba · a6e10ba
1 parent e55e4d9
commit a6e10ba
Show file tree

Hide file tree

Showing 39 changed files with 4,924 additions and 4,914 deletions.
diff --git a/data/Components.js b/data/Components.js
@@ -54,6 +54,7 @@ export default class Components extends Map {
     definition:          `Project Definition`,
     deverbal:            `Deverbal (y/n)`,
     dialect:             `Dialect`,
+    finalType:           `Final: secondary (y/n/b)`,
     firstCheck:          `1st check done`,
     gloss:               `Translation`,
     Glottocode:          `Glottocode`,
@@ -69,7 +70,6 @@ export default class Components extends Map {
     pages:               `Page #`,
     proto:               `PA form (original orthography)`,
     reduplicated:        `Initial: Reduplicated`,
-    secondaryFinal:      `Final: secondary (y/n/b)`,
     secondCheck:         `2nd check done`,
     sourceCode:          `Source Code`,
     speaker:             `Speaker`,
@@ -211,12 +211,22 @@ export default class Components extends Map {
     // Subcategory
     component.subcategory = record[cols.subcategory]
 
-    // Reduplicated Initial
+    // Initial: Reduplicated
     component.reduplicated = record[cols.reduplicated] === `Y`
 
-    // Final Specificity
+    // Final: Concrete/Abstract
     component.specificity = record[cols.specificity]
 
+    // Final: Primary/Secondary
+    if (component.type === `final`) {
+
+      const finalType = record[cols.finalType]
+
+      component.primary   = finalType === `B` || !finalType
+      component.secondary = finalType === `B` || finalType === `Y`
+
+    }
+
     // Tokens
     component.tokens = record.tokens.map(token => this.convertToken(token, language))
 

diff --git a/data/json/components/Abenaki.ndjson b/data/json/components/Abenaki.ndjson
@@ -2,5 +2,5 @@
 {"componentID":"2","ID":"Abenaki-2","language":"Abenaki","displayLanguage":"Abenaki","dialect":"","Glottocode":"aben1250","ISO":"","form":"ôjemi-","UR":"","PA":"*a·t-","definition":"","type":"initial","subcategory":"","reduplicated":false,"specificity":"","tokens":[{"bibliography":"IG1965: 214","form":"ôjemi-","gloss":"relate, declare","PA":"*a·t-","UR":""}]}
 {"componentID":"3","ID":"Abenaki-3","language":"Abenaki","displayLanguage":"Abenaki","dialect":"","Glottocode":"aben1250","ISO":"","form":"ôtl-","UR":"","PA":"*a·nt-","definition":"","type":"initial","subcategory":"","reduplicated":false,"specificity":"","tokens":[{"bibliography":"IG1965: 214","form":"ôtl-","gloss":"move, change, afresh, anew","PA":"*a·nt-","UR":""}]}
 {"componentID":"4","ID":"Abenaki-4","language":"Abenaki","displayLanguage":"Abenaki","dialect":"","Glottocode":"aben1250","ISO":"","form":"ôtto-","UR":"","PA":"*a·nt-","definition":"","type":"initial","subcategory":"","reduplicated":false,"specificity":"","tokens":[{"bibliography":"IG1965: 214","form":"ôtto-","gloss":"move, change, afresh, anew","PA":"*a·nt-","UR":""}]}
-{"componentID":"5","ID":"Abenaki-5","language":"Abenaki","displayLanguage":"Abenaki","dialect":"","Glottocode":"aben1250","ISO":"","form":"-gan̈bawi","UR":"","PA":"*-ka·pawi-","definition":"","type":"final","subcategory":"AI","reduplicated":false,"specificity":"","tokens":[{"bibliography":"IG1965: 215","form":"-gan̈ba8i","gloss":"stand, be standing","PA":"*-ka·pawi-","UR":""}]}
-{"componentID":"6","ID":"Abenaki-6","language":"Abenaki","displayLanguage":"Abenaki","dialect":"","Glottocode":"aben1250","ISO":"","form":"-igan̈n","UR":"","PA":"","definition":"","type":"final","subcategory":"N","reduplicated":false,"specificity":"","tokens":[{"bibliography":"IG1965: 219","form":"-igan̈n","gloss":"","PA":"","UR":""}]}
+{"componentID":"5","ID":"Abenaki-5","language":"Abenaki","displayLanguage":"Abenaki","dialect":"","Glottocode":"aben1250","ISO":"","form":"-gan̈bawi","UR":"","PA":"*-ka·pawi-","definition":"","type":"final","subcategory":"AI","reduplicated":false,"specificity":"","primary":true,"secondary":false,"tokens":[{"bibliography":"IG1965: 215","form":"-gan̈ba8i","gloss":"stand, be standing","PA":"*-ka·pawi-","UR":""}]}
+{"componentID":"6","ID":"Abenaki-6","language":"Abenaki","displayLanguage":"Abenaki","dialect":"","Glottocode":"aben1250","ISO":"","form":"-igan̈n","UR":"","PA":"","definition":"","type":"final","subcategory":"N","reduplicated":false,"specificity":"","primary":true,"secondary":false,"tokens":[{"bibliography":"IG1965: 219","form":"-igan̈n","gloss":"","PA":"","UR":""}]}
diff --git a/data/json/components/Abenaki_Eastern.ndjson b/data/json/components/Abenaki_Eastern.ndjson
diff --git a/data/json/components/Arapaho.ndjson b/data/json/components/Arapaho.ndjson
diff --git a/data/json/components/Blackfoot.ndjson b/data/json/components/Blackfoot.ndjson
diff --git a/data/json/components/Cheyenne.ndjson b/data/json/components/Cheyenne.ndjson
diff --git a/data/json/components/Cree_Atikamekw.ndjson b/data/json/components/Cree_Atikamekw.ndjson
diff --git a/data/json/components/Cree_East.ndjson b/data/json/components/Cree_East.ndjson
@@ -1,5 +1,5 @@
 {"componentID":"1","ID":"Cree_East-1","language":"Cree_East","displayLanguage":"East Cree","dialect":"","Glottocode":"---","ISO":"---","form":"-kot-","UR":"","PA":"","definition":"","type":"medial","reduplicated":false,"tokens":[{"bibliography":"RV2002: 112","form":"-kot-","gloss":"nose","PA":"","UR":""}]}
-{"componentID":"2","ID":"Cree_East-2","language":"Cree_East","displayLanguage":"East Cree","dialect":"","Glottocode":"---","ISO":"---","form":"-yi","UR":"","PA":"","definition":"","type":"final","subcategory":"AI","reduplicated":false,"tokens":[{"bibliography":"RV2002: 117","form":"-yi","gloss":"self-initiated body movement","PA":"","UR":""}]}
+{"componentID":"2","ID":"Cree_East-2","language":"Cree_East","displayLanguage":"East Cree","dialect":"","Glottocode":"---","ISO":"---","form":"-yi","UR":"","PA":"","definition":"","type":"final","subcategory":"AI","reduplicated":false,"primary":true,"secondary":false,"tokens":[{"bibliography":"RV2002: 117","form":"-yi","gloss":"self-initiated body movement","PA":"","UR":""}]}
 {"componentID":"3","ID":"Cree_East-3","language":"Cree_East","displayLanguage":"East Cree","dialect":"","Glottocode":"---","ISO":"---","form":"čiič-","UR":"","PA":"","definition":"","type":"initial","subcategory":"","reduplicated":false,"specificity":"","tokens":[{"bibliography":"RV2002: 102","form":"chiich-","gloss":"","PA":"","UR":""}]}
 {"componentID":"4","ID":"Cree_East-4","language":"Cree_East","displayLanguage":"East Cree","dialect":"","Glottocode":"---","ISO":"---","form":"paahp-","UR":"","PA":"","definition":"","type":"initial","reduplicated":false,"tokens":[{"bibliography":"RV2002: 107","form":"paahp-","gloss":"laugh","PA":"","UR":""}]}
 {"componentID":"5","ID":"Cree_East-5","language":"Cree_East","displayLanguage":"East Cree","dialect":"","Glottocode":"---","ISO":"---","form":"pahkope-","UR":"","PA":"","definition":"","type":"initial","subcategory":"","reduplicated":false,"specificity":"","tokens":[{"bibliography":"RV2002: 103","form":"pahkope-","gloss":"","PA":"","UR":""}]}