word: select mkwordlist forms from _cat_words view

diff --git a/tools/mkwordlist b/tools/mkwordlist
index bec1362b51b2c6a39cd94a2c75912ca1dc73f48f..d4dfaa245cf8e28e563b4bc4c47f9ca64aefdecd 100755 (executable)
--- a/tools/mkwordlist
+++ b/tools/mkwordlist
@@ -1,8 +1,4 @@
 #!/bin/sh
 psql sheet -XAt -c "
-       SELECT json_object_agg(coalesce(form, ''), forms)
-               FROM word RIGHT JOIN (
-                       SELECT cat id, array_agg(form ORDER BY form) forms
-                               FROM word WHERE ref IS NULL GROUP BY cat
-               ) sub USING (id)
+       SELECT json_object_agg(coalesce(form, ''), forms) FROM _cat_words
 " | sed 's/:/=>/g'

diff --git a/tools/word.pg.sql b/tools/word.pg.sql
index 6cab79d2b2f503cc22ccde5aa7c6db323af1c7ed..da22b55311246348d8832e07542511b9aa3815d0 100644 (file)
--- a/tools/word.pg.sql
+++ b/tools/word.pg.sql
@@ -19,3 +19,9 @@ COMMENT ON COLUMN word.prio       IS 'difficulty level or importance; lower valu
 COMMENT ON COLUMN word.source     IS 'URI of downloaded image';
 COMMENT ON COLUMN word.thumb      IS 'ImageMagick convert options to create thumbnail from source image';
 COMMENT ON COLUMN word.wptitle    IS 'reference Wikipedia article';
+
+CREATE OR REPLACE VIEW _cat_words AS
+       SELECT * FROM word RIGHT JOIN (
+               SELECT cat id, array_agg(form ORDER BY form) forms
+                       FROM word WHERE ref IS NULL GROUP BY cat
+       ) sub USING (id);