X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/31a341925c07c850260b269047f9ed2fd0b6c006..19f02522730843594a07ae01d184f127c390c852:/word.plp?ds=inline
diff --git a/word.plp b/word.plp
index 4d60f9a..977545f 100644
--- a/word.plp
+++ b/word.plp
@@ -1,7 +1,20 @@
<(common.inc.plp)><:
-my $wordlist = 'wordlist.en.inc.pl';
-my $limit = $get{v} // (exists $get{v} ? 4 : 3);
+our $lang = $get{lang} || 'en';
+our $wordlistbase = "data/wordlist";
+
+if ($Request and $Request =~ m{\A([^/]+)}) {
+ my $page = "word/$1.plp";
+ utf8::downgrade($page); # unicode filename breaks contents encoding
+ if (-e $page) {
+ $wordlistbase .= ".$lang";
+ Include $page;
+ exit;
+ }
+}
+
+my $wordlist = "$wordlistbase.inc.pl";
+my $limit = $get{v} // (exists $get{v} ? 5 : 3);
Html({
title => 'words cheat sheet',
@@ -11,7 +24,7 @@ Html({
language
'],
data => [$wordlist],
- raw => (exists $get{q} && <<'EOT')
+ raw => exists $get{q} ? <<'EOT' : undef,
-EOT
- . <<'EOT',
-
EOT
});
@@ -69,7 +75,7 @@ sub showimg {
$name = "$name
" if $name =~ s/\?$//;
$name = "$name";
- if ($id and -e (my $img = "data/word/en/$id.jpg")) {
+ if ($id and -e (my $img = "data/word/32/$id.jpg")) {
$name .= sprintf '', $img, $imgname;
}
return sprintf '', $hidden && !exists $get{v} && ' hidden', $name;
@@ -78,7 +84,8 @@ sub showimg {
sub printimgs {
say '
';
for my $row (@_) {
- my ($id, $level, $title) = split /:/, $row, 3;
+ my ($id, $level, $title) = @{$row};
+ $id or die "empty reference"; # assertion to prevent loops
my @type;
push @type, 'parent' if defined $table->{$id};
push @type, 'large' if $level =~ s/c$//;
@@ -93,12 +100,26 @@ sub printimgs {
say '';
if (exists $get{q}) {
- my @rows = map {@$_} values %{$table}; # flatten categories
+ my @rows;
+ if ($Request) {
+ my @query = $Request;
+ while (@query) {
+ push @rows, grep { $_->[1] <= $limit } @query;
+ $_ = $_->[0] for @query;
+ @query = map {$_ ? @{$_} : ()} @{$table}{@query};
+ }
+ }
+ else {
+ @rows = map {ref ? @$_ : $_} values %{$table}; # flatten categories
+ }
@rows = sort { rand <=> .5 } @rows;
$table = {};
printimgs(@rows);
}
+elsif ($Request and $Request =~ /^\d+$/) {
+ printimgs([$Request]);
+}
else {
- printimgs($Request || $table->{''}->[0]);
+ printimgs($table->{''}->[0]);
}
say '';