From e1678ab9198c2709c7363af618fa5c7bd26930f5 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 16 Jun 2020 00:34:40 +0200
Subject: [PATCH] word: identify rows by id number

With the addition of more entries, names are no longer unique:
for example pink (colour and flower) in multiple categories.
---
 tools/mkwordlist  |  2 +-
 tools/word.pg.sql |  3 ++-
 word.plp          | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tools/mkwordlist b/tools/mkwordlist
index b88cd1b..e1729a3 100755
--- a/tools/mkwordlist
+++ b/tools/mkwordlist
@@ -1,5 +1,5 @@
 #!/bin/sh
 echo 'use utf8;'
 psql sheet -XAt -c "
-	SELECT json_object_agg(coalesce(form, ''), forms) FROM _cat_words
+	SELECT json_object_agg(coalesce(id::text, ''), forms) FROM _cat_words
 " | sed 's/ : / => /g'
diff --git a/tools/word.pg.sql b/tools/word.pg.sql
index 3a0f158..3c05c38 100644
--- a/tools/word.pg.sql
+++ b/tools/word.pg.sql
@@ -42,7 +42,8 @@ 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;
diff --git a/word.plp b/word.plp
index 1af9c75..78e46a5 100644
--- a/word.plp
+++ b/word.plp
@@ -55,19 +55,19 @@ sub showimg {
 sub printimgs {
 	say '<ul>';
 	for my $row (@_) {
-		my ($level, $mark, $title) = split /([a-z]*):/, $row, 2;
+		my ($id, $level, $title) = split /:/, $row, 3;
 		my @type;
-		push @type, 'parent' if defined $table->{$row};
-		push @type, 'large'  if $mark;
+		push @type, 'parent' if defined $table->{$id};
+		push @type, 'large'  if $level =~ s/c$//;
 		push @type, 'level'.($level || 0);
 		printf '<li%s>', @type ? sprintf ' class="%s"', join ' ', @type : '';
 		print showimg($title) if $level <= $limit;
-		printimgs(@{$_}) for $table->{$row} // ();
+		printimgs(@{$_}) for $table->{$id} // ();
 		print '</li>';
 	}
 	say '</ul>';
 }
 
 say '<section class="gallery">';
-printimgs(@{$table->{''}});
+printimgs($table->{''}->[0]);
 say '</section>';
-- 
2.30.0