common: common Alert function to format error messages

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index ebcbc32f5a1b2c061bc7232b85178150e323d8af..d3b27b5df1c9513bffbde53de22307f642f3f2e1 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -24,19 +24,18 @@ my $glyphs = Shiar_Sheet::FormatChar->new;
 my @nibble = (0..9, 'A'..'F');
 my $nibsize = 1;
 
-use Encode qw(decode resolve_alias);
 # generate character table(s)
 # (~16x faster than decoding in loop;
 #  substr strings is twice as fast as splitting to an array)
 my %ALIAS = (
 #      default => [qw(unicode utf-8 iso-8859-1 cp437 -cp1252- --iso-8859-15- -koi8-f)],
        default => [qw(unicode- utf-8 iso-8859-1 -cp1252- --iso-8859-15- cp437 -cp850)],
-       0 => [qw(cp437 cp863)],
-       1 => [qw(iso-8859-1 cp1252 MacRoman cp850)],
-       2 => [qw(iso-8859-2 cp1250 cp852 MacCentralEurRoman MacCroatian MacRumanian)],
-       5 => [qw(koi8-f iso-8859-5 cp1251 MacCyrillic cp855 cp866)],
-       7 => [qw(iso-8859-7 cp1253 MacGreek cp737 cp869)],
-       8 => [qw(iso-8859-8 cp1255 MacHebrew cp862)],
+       0 => [qw(cp437 -cp863)],
+       1 => [qw(iso-8859-1 -cp1252 -MacRoman -cp850)],
+       2 => [qw(iso-8859-2 -cp1250 -cp852 -MacCentralEurRoman -MacCroatian -MacRumanian)],
+       5 => [qw(koi8-f -iso-8859-5 -cp1251 -MacCyrillic -cp855 -cp866)],
+       7 => [qw(iso-8859-7 -cp1253 -MacGreek -cp737 -cp869)],
+       8 => [qw(iso-8859-8 -cp1255 -MacHebrew -cp862)],
 );
 my @request = map {
        if (my $input = $_) {
@@ -67,37 +66,37 @@ my @request = map {
                        $row{table} = ' ' x 1024;
                        $row{set} = 'Unicode planes';
                        $row{cell} = do 'charset-ucplanes.inc.pl'
-                               or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
+                               or Alert('Table data could not be read', $@ || $!);
                        @nibble = (map { $_.0, $_.8 } 0 .. 7);
                        $nibsize = 8;
                }
-               elsif ($row{set} = resolve_alias($input)) {
+               elsif ($row{set} = Encode::resolve_alias($input)) {
                        if ($row{set} eq 'Internal') {
                                $row{table} = ' ' x ($endpoint < 255 ? 640 : 8192);
                                $row{set} = 'Unicode BMP';
                                $row{cell} = do 'charset-unicode.inc.pl'
-                                       or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
+                                       or Alert('Table data could not be read', $@ || $!);
                        }
                        elsif ($row{set} eq 'utf-8-strict') {
                                $row{table} = undef;
                                $row{set} = 'UTF-8';
                                $row{cell} = do 'charset-utf8.inc.pl'
-                                       or printf "<p class=error>Table data could not be read: <em>%s</em>.</p>\n", $@ || $!;
+                                       or Alert('Table data could not be read', $@ || $!);
                        }
                        else {
-                               $row{table} = decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
+                               $row{table} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
                        }
                }
                else {
-                       print "<p>Encoding $input unknown</p>\n";
+                       Alert("Encoding <q>$input</q> unknown");
                }
-               \%row;
+               $row{set} ? \%row : ();
        }
        else {
                ();
        }
 } map { defined $ALIAS{$_} ? @{ $ALIAS{$_} } : $_ }
-       $ENV{PATH_INFO} =~ /\w/ ? split(m{[/+\s]}, $ENV{PATH_INFO}) : 'default';
+       $Request =~ /\w/ ? split(m{[/+\s]}, $Request) : 'default';
 my $NOCHAR = chr 0xFFFD;
 
 for my $cp437 (grep {$request[$_]->{set} eq 'cp437'} 0 .. $#request) {
@@ -123,7 +122,7 @@ sub range_cell {
                $cols = $len if $len < $cols; #TODO: optimise
                if ($len -= $cols) {
                        # continued on new row
-                       $table->{$offset + $nibsize*$cols} = [$len*$nibsize, "$class joinu", $name, $title];
+                       $table->{$offset + $nibsize*$cols} //= [$len*$nibsize, "$class joinu", $name, $title];
                        $name = '';
                        $class .= ' joind';
                }
@@ -133,7 +132,7 @@ sub range_cell {
                # multiple full rows
                if ($len -= $rows << 4) {
                        # partial row remains
-                       $table->{$offset + $nibsize*$rows * 16} = [$len*$nibsize, "$class joinu", '', $title];
+                       $table->{$offset + $nibsize*$rows * 16} //= [$len*$nibsize, "$class joinu", '', $title];
                        $class .= ' joind';
                }
                $attr .= sprintf ' rowspan=%d', $rows;
@@ -182,7 +181,7 @@ for my $row (@request) {
                }
                print "\n";
        }
-       print "</table></div>\n";
+       say '</table></div>';
 }
 
 :>