X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/5d52e8a4f389cd87b310c609ec76c9ba339284f6..74d561810b2bf81617b84bc1581d8b59c359d5c9:/tools/word.pg.sql

diff --git a/tools/word.pg.sql b/tools/word.pg.sql
index 1dc4f5b..3c05c38 100644
--- a/tools/word.pg.sql
+++ b/tools/word.pg.sql
@@ -1,32 +1,49 @@
+CREATE TABLE login (
+	username   text        NOT NULL UNIQUE,
+	pass       text,
+	email      text,
+	fullname   text,
+	editlang   text[],
+	id         serial      NOT NULL PRIMARY KEY
+);
+
 CREATE TABLE word (
 	form       text        NOT NULL,
 	alt        text[],
-	lang       text        NOT NULL DEFAULT 'eng',
+	lang       text        NOT NULL DEFAULT 'en',
 	cat        integer              REFERENCES word (id),
 	ref        integer              REFERENCES word (id),
-	prio       smallint    NOT NULL DEFAULT '1',
+	prio       smallint             DEFAULT '1'
+	                                CHECK (prio >= 0 OR ref IS NOT NULL),
+	grade      integer,
 	cover      boolean     NOT NULL DEFAULT FALSE,
 	source     text,
 	thumb      text[],
 	wptitle    text,
 	created    timestamptz          DEFAULT now(),
+	creator    integer              REFERENCES login (id),
+	updated    timestamptz,
 	id         serial      NOT NULL PRIMARY KEY
 );
 
 COMMENT ON COLUMN word.form       IS 'preferred textual representation';
 COMMENT ON COLUMN word.alt        IS 'alternate forms with equivalent meaning';
-COMMENT ON COLUMN word.lang       IS 'ISO 639-3 language code';
+COMMENT ON COLUMN word.lang       IS 'ISO 639 language code matching wikipedia subdomain';
 COMMENT ON COLUMN word.cat        IS 'hierarchical classification';
-COMMENT ON COLUMN word.ref        IS 'reference to equivalent eng translation';
+COMMENT ON COLUMN word.ref        IS 'reference to equivalent en 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';
+COMMENT ON COLUMN word.updated    IS 'last significant change';
+COMMENT ON COLUMN word.creator    IS 'user responsible for initial submit';
 
 CREATE OR REPLACE FUNCTION exportform(word) RETURNS text AS $$
 	SELECT concat(
-		$1.prio || CASE WHEN $1.cover THEN 'c' ELSE '' END || ':',
+		$1.id, ':',
+		$1.prio, CASE WHEN $1.cover THEN 'c' ELSE '' END, ':',
 		array_to_string($1.form || $1.alt, '/')
 	);
 $$ LANGUAGE SQL IMMUTABLE;
@@ -34,6 +51,6 @@ $$ 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);