X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/30bf0fcde3f7e44f1ec7bcfc8253dfce8f81e8e6..8ed7634d0fa3b7154275c14477b361b358ee783f:/word.plp

diff --git a/word.plp b/word.plp
index 9fa1aaa..6b42866 100644
--- a/word.plp
+++ b/word.plp
@@ -1,16 +1,19 @@
 <(common.inc.plp)><:
 
+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 $lang = $get{lang} || 'en';
-my $wordlist = "data/wordlist.$lang.inc.pl";
-my $limit = $get{v} // (exists $get{v} ? 4 : 3);
+my $limit = $get{v} // (exists $get{v} ? 5 : 3);
 
 Html({
 	title => 'words cheat sheet',
@@ -19,8 +22,8 @@ Html({
 	keywords => [qw'
 		language
 	'],
-	data => [$wordlist],
-	raw => (exists $get{q} && <<'EOT')
+	data => ["$wordlistbase.inc.pl"],
+	raw => exists $get{q} ? <<'EOT' : undef,
 <style>
 .gallery figure {
 	grid-row: span 1 !important;
@@ -40,13 +43,6 @@ Html({
 	font-size: 175% !important;
 }
 </style>
-EOT
-		. <<'EOT',
-<style>
-body {
-	margin: 8px 1px;
-}
-</style>
 EOT
 });
 
@@ -65,7 +61,7 @@ Zie ook <a href="/dieren">dieren</a>.
 </p>
 
 <:
-my $table = do $wordlist or die $@ // $!;
+my $table = Data($wordlistbase);
 
 sub showimg {
 	my ($id, $name) = @_;
@@ -78,7 +74,7 @@ sub showimg {
 	$name = "<q>$name</q>" if $name =~ s/\?$//;
 	$name = "<figcaption>$name</figcaption>";
 
-	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 src="/%s" alt="%s" />', $img, $imgname;
 	}
 	return sprintf '<figure%s>%s</figure>', $hidden && !exists $get{v} && ' hidden', $name;
@@ -87,7 +83,8 @@ sub showimg {
 sub printimgs {
 	say '<ul>';
 	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$//;
@@ -106,8 +103,8 @@ if (exists $get{q}) {
 	if ($Request) {
 		my @query = $Request;
 		while (@query) {
-			push @rows, grep { (split /:/)[1] <= $limit } @query;
-			s/:.*// for @query;
+			push @rows, grep { $_->[1] <= $limit } @query;
+			$_ = $_->[0] for @query;
 			@query = map {$_ ? @{$_} : ()} @{$table}{@query};
 		}
 	}
@@ -118,7 +115,10 @@ if (exists $get{q}) {
 	$table = {};
 	printimgs(@rows);
 }
+elsif ($Request and $Request =~ /^\d+$/) {
+	printimgs([$Request]);
+}
 else {
-	printimgs($Request || $table->{''}->[0]);
+	printimgs($table->{''}->[0]);
 }
 say '</section>';