word: category references (recursive selection)

[sheet.git] / tools / mkwordlist

diff --git a/tools/mkwordlist b/tools/mkwordlist
index 78e36b6adb5d652e258ec1ad10a9df255d6da9e9..655524639e4131e8fecce2a68a806550d7faca23 100755 (executable)
--- a/tools/mkwordlist
+++ b/tools/mkwordlist
@@ -13,8 +13,9 @@ use Data::Dump 'pp';
 my %rows;
 if (my $lang = shift @ARGV) {
        my %filter = (lang => $lang);
-       my $cols = "ref, array_to_string(form || alt, '/'), prio + coalesce(grade, 90) / 100::float, id, cat";
-       %rows = $db->select(_word_ref => $cols, \%filter)->map_arrays;
+       my $cols = "ref, array_to_string(form || alt, '/'), prio, id, sub";
+       %rows = $db->select(_word => $cols, \%filter)->map_arrays;
+       defined $_->[-1] or pop @$_ for values %rows;
        say pp \%rows
                =~ s/\\x\{([0-9A-F]+)\}/chr hex $1/ger;
        exit;