unicode: one set of barb arrows from unicode 7.0

[sheet.git] / word.plp

diff --git a/word.plp b/word.plp
index a7acea5ae10d9874e3324b8ffc4117ed27077531..b96ebdbbf632d884e6a7ae85e1b39fdbe00aa0ad 100644 (file)
--- a/word.plp
+++ b/word.plp
@@ -1,13 +1,20 @@
 <(common.inc.plp)><:
 
-if ($Request and $Request =~ s{^edit/?}{}) {
-       Include 'writer.plp';
-       exit;
+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 $wordlist = "$wordlistbase.inc.pl";
+my $limit = $get{v} // (exists $get{v} ? 5 : 3);
 
 Html({
        title => 'words cheat sheet',
@@ -75,7 +82,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;
@@ -84,7 +91,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$//;
@@ -103,8 +111,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};
                }
        }
@@ -115,7 +123,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>';