X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/8c855abc140a52d23fed749e936733d3d1eee4f8..50442220cc52bad55c1003de34f8dada958650d5:/tools/word.pg.sql

diff --git a/tools/word.pg.sql b/tools/word.pg.sql
index eabf17d..821814d 100644
--- a/tools/word.pg.sql
+++ b/tools/word.pg.sql
@@ -8,17 +8,17 @@ CREATE TABLE login (
 );
 
 CREATE TABLE word (
-	form       text        NOT NULL,
+	form       text,
 	alt        text[],
-	lang       text        NOT NULL DEFAULT 'en',
+	lang       text                 DEFAULT 'en',
 	cat        integer              REFERENCES word (id),
 	ref        integer              REFERENCES word (id),
 	prio       smallint             DEFAULT '1'
 	                                CHECK (prio >= 0 OR ref IS NOT NULL),
 	grade      integer,
 	cover      boolean     NOT NULL DEFAULT FALSE,
-	source     text                 CHECK (source ~ '^https?://'),
-	thumb      text[],
+	image      jsonb                CHECK (image->>'source' ~ '^https?://'
+	                                   AND jsonb_typeof(image->'convert') = 'array'),
 	wptitle    text,
 	story      text,
 	creator    integer              REFERENCES login (id),
@@ -35,8 +35,7 @@ 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.image      IS 'metadata of illustrations, including downloaded URI and ImageMagick convert options';
 COMMENT ON COLUMN word.wptitle    IS 'reference Wikipedia article';
 COMMENT ON COLUMN word.story      IS 'paragraph defining or describing the entity, wikipedia intro';
 COMMENT ON COLUMN word.updated    IS 'last significant change';
@@ -57,7 +56,7 @@ COMMENT ON COLUMN kind.truth      IS 'link validity ranging from 0 (never) to 10
 
 CREATE OR REPLACE FUNCTION exportform(word) RETURNS text AS $$
 	SELECT concat(
-		$1.id, ':',
+		coalesce($1.ref, $1.id), ':',
 		$1.prio, CASE WHEN $1.cover THEN 'c' ELSE '' END, ':',
 		array_to_string($1.form || $1.alt, '/')
 	);
@@ -71,12 +70,11 @@ CREATE OR REPLACE VIEW _word_ref AS
 		coalesce(r.prio,    w.prio   ) prio,
 		coalesce(r.grade,   w.grade  ) grade,
 		coalesce(r.cover,   w.cover  ) cover,
-		coalesce(r.source,  w.source ) source,
-		coalesce(r.thumb,   w.thumb  ) thumb,
+		coalesce(r.image,   w.image  ) image,
 		coalesce(r.wptitle, w.wptitle) wptitle,
 		coalesce(r.story,   w.story  ) story,
 		r.creator, r.created, r.updated,
-		CASE WHEN r.source IS NULL THEN w.id ELSE r.id END id -- image id
+		CASE WHEN r.image IS NULL THEN w.id ELSE r.id END id -- image id
 	FROM word r
 	LEFT JOIN word w ON w.id = r.ref;