From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 15 Jun 2020 22:51:35 +0000 (+0200)
Subject: word: identify thumbnail image files by id
X-Git-Tag: v1.13~206
X-Git-Url: http://git.shiar.net/sheet.git/commitdiff_plain/c6d80876bdce00b6e71600f83b58e0afcb481495

word: identify thumbnail image files by id
---

diff --git a/word.plp b/word.plp
index 78e46a5..40cc889 100644
--- a/word.plp
+++ b/word.plp
@@ -37,16 +37,15 @@ Zie ook <a href="/dieren">dieren</a>.
 my $table = do $wordlist or die $@ // $!;
 
 sub showimg {
-	my ($name) = @_;
-	my ($imgname) = $name =~ /^([\w -]+)/;
+	my ($id, $name) = @_;
+	my ($imgname) = $name =~ m{^([^/]+)};
 	$name =~ s/\w{4} [^aoeuiyc\W] [rl]?+ \K (?= [^aoeuiy\W] [rl]? [aoeuiy] \w)/&shy;/gx;
 	$name =~ s{/(.*)}{ <small>($1)</small>}g;
 	my $hidden = $name =~ s/\?$//;
-	my $alt = $name;
 	$name = "<q>$name</q>" if $name =~ s/\?$//;
 	$name = "<figcaption>$name</figcaption>";
 
-	if ($imgname and -e (my $img = "data/word/en/$imgname.jpg")) {
+	if ($id and -e (my $img = "data/word/en/$id.jpg")) {
 		$name .= sprintf '<img src="/%s" alt="%s" />', $img, $imgname;
 	}
 	return sprintf '<figure%s>%s</figure>', $hidden && !exists $get{v} && ' hidden', $name;
@@ -61,7 +60,7 @@ sub printimgs {
 		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;
+		print showimg($id, $title) if $level <= $limit;
 		printimgs(@{$_}) for $table->{$id} // ();
 		print '</li>';
 	}
diff --git a/writer.plp b/writer.plp
index 48ffd67..7cbe9e6 100644
--- a/writer.plp
+++ b/writer.plp
@@ -300,7 +300,7 @@ package Shiar_Sheet::FormRow {
 	sub imagepath {
 		my ($row, $col) = @_;
 		return "data/word/org/$row->{id}.jpg"   if $col eq 'source';
-		return "data/word/en/$row->{form}.jpg"  if $col eq 'thumb';
+		return "data/word/en/$row->{id}.jpg"  if $col eq 'thumb';
 		return;
 	}
 }