X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/02a613aad40864c291bb2e8d499050d4aa6fc344..74d561810b2bf81617b84bc1581d8b59c359d5c9:/word.plp
diff --git a/word.plp b/word.plp
index 4552572..4d60f9a 100644
--- a/word.plp
+++ b/word.plp
@@ -11,54 +11,31 @@ Html({
language
'],
data => [$wordlist],
- raw => <<'EOT',
+ raw => (exists $get{q} && <<'EOT')
+EOT
+ . <<'EOT',
+
EOT
@@ -75,22 +52,24 @@ if (exists $get{debug}) {
Under construction.
Zie ook dieren.
+Omit translations to test.
<:
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)//gx;
- $name =~ s{/(.*)}{ ($1)}g;
+ ($name, my @morenames) = split m{/}, $name;
+ $name =~ s{\( ([^/]+) \)}{$1}x;
+ $name .= " ($_)" for @morenames;
my $hidden = $name =~ s/\?$//;
- my $alt = $name;
$name = "$name
" if $name =~ s/\?$//;
$name = "$name";
- 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, $imgname;
}
return sprintf '%s', $hidden && !exists $get{v} && ' hidden', $name;
@@ -99,17 +78,27 @@ sub showimg {
sub printimgs {
say '';
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 '- ', @type ? sprintf ' class="%s"', join ' ', @type : '';
- print showimg($title) if $level <= $limit;
- printimgs(@{$_}) for $table->{$row} // ();
+ print showimg($id, $title) if $level <= $limit;
+ printimgs(@{$_}) for $table->{$id} // ();
print '
';
}
say '
';
}
-printimgs(@{$table->{''}});
+say '';
+if (exists $get{q}) {
+ my @rows = map {@$_} values %{$table}; # flatten categories
+ @rows = sort { rand <=> .5 } @rows;
+ $table = {};
+ printimgs(@rows);
+}
+else {
+ printimgs($Request || $table->{''}->[0]);
+}
+say '';