word edit: common function to format form input

[sheet.git] / tools / word.pg.sql

diff --git a/tools/word.pg.sql b/tools/word.pg.sql
index c1aa3c811322177975a86648ede30fee404b3ccf..31a117e83001ba926fd8ec06b09a95c1e6b085b1 100644 (file)
--- a/tools/word.pg.sql
+++ b/tools/word.pg.sql
@@ -5,6 +5,8 @@ CREATE TABLE word (
        cat        integer              REFERENCES word (id),
        ref        integer              REFERENCES word (id),
        prio       smallint    NOT NULL DEFAULT '1',
+       grade      integer,
+       cover      boolean     NOT NULL DEFAULT FALSE,
        source     text,
        thumb      text[],
        wptitle    text,
@@ -18,17 +20,22 @@ COMMENT ON COLUMN word.lang       IS 'ISO 639-3 language code';
 COMMENT ON COLUMN word.cat        IS 'hierarchical classification';
 COMMENT ON COLUMN word.ref        IS 'reference to equivalent eng translation';
 COMMENT ON COLUMN word.prio       IS 'difficulty level or importance; lower values have precedence';
+COMMENT ON COLUMN word.grade      IS 'ascending hierarchical order, preceding default alphabetical';
+COMMENT ON COLUMN word.cover      IS 'highlight if selected';
 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 FUNCTION exportform(word) RETURNS text AS $$
-       SELECT array_to_string($1.form || $1.alt, '/');
+       SELECT concat(
+               $1.prio || CASE WHEN $1.cover THEN 'c' ELSE '' END || ':',
+               array_to_string($1.form || $1.alt, '/')
+       );
 $$ LANGUAGE SQL IMMUTABLE;
 
 CREATE OR REPLACE VIEW _cat_words AS
        SELECT exportform(word.*) form, sub.*, word.lang, word.ref
        FROM word RIGHT JOIN (
-               SELECT cat id, array_agg(exportform(word.*) ORDER BY form) forms
+               SELECT cat id, array_agg(exportform(word.*) ORDER BY grade, form) forms
                        FROM word WHERE ref IS NULL GROUP BY cat
        ) sub USING (id);