remove diamond_(5|6)_N

WordNetRon.gf

@@ -26700,8 +26700,8 @@ lin diamond_1_N = mkN "diamant" ;
 lin diamond_2_N = mkN "diamant" ;
 lin diamond_3_N = mkN "romb" ;
 lin diamond_4_N = mkN "romb" ;
-lin diamond_5_N = mkN "terendebaseball" ;
-lin diamond_6_N = mkN "diamant" ; --guessed
+lin diamond_5_N = variants {} ;
+lin diamond_6_N = variants {} ;
 lin diamondback_N = variants {} ;
 lin diana_GN = mkPN "Diana" Feminine ;
 lin diana_2_PN = mkPN "Diana" ;

bootstrap/names.py

@@ -21,13 +21,12 @@ def extract(wiki_fpath):
                     if "datavalue" not in claim["mainsnak"]:
                         continue
                     typ = claim["mainsnak"]["datavalue"]["value"]["id"]
-                    if typ in ["Q202444","Q12308941","Q11879590","Q101352","Q3918","Q618779"]:
+                    if typ in ["Q202444","Q101352","Q3918","Q618779"]:
                         name_type = typ
-                    if typ in ["Q18972245","Q18972207"]:
+                    if typ in ["Q12308941","Q11879590","Q18972245","Q18972207"]:
                         gender = typ
+                name_type = gender or name_type
                 if name_type:
-                    if gender:
-                        name_type = gender
                     names = {}
                     for lang,val in record["labels"].items():
                         names[lang] = val["value"]

bootstrap/panlex.sql

@@ -7,6 +7,10 @@ create table langvar(id integer primary key not null,lang_code char(3),var_code
 create table expr(id integer primary key not null,langvar integer not null,txt text not null,txt_degr text not null);
 create table meaning(id integer primary key not null,source integer not null);
 create table denotation(id integer primary key not null,meaning integer not null,expr integer not null);
+create table denotation_class(id integer primary key not null,denotation integer not null,expr1 integer,expr2 integer not null);
+
+meaning integer not null,expr integer not null);
+
 
 .separator ","
 .headers on
@@ -50,4 +54,10 @@ end transaction;
 
 create index denontation_expr on denotation(expr);
 
+.print "import denotation_class"
+
+begin transaction;
+.import "data/panlex-csv/denotation_class.csv" denotation_class
+end transaction;
+
 .quit