common: common Alert function to format error messages
authorMischa POSLAWSKY <perl@shiar.org>
Thu, 30 Mar 2017 13:15:01 +0000 (15:15 +0200)
committerMischa POSLAWSKY <perl@shiar.org>
Mon, 24 Apr 2017 18:25:53 +0000 (20:25 +0200)
Technical details in 2nd argument only shown in dev environment.

charset.plp
common.inc.plp
latin.plp

index fcd647d..d3b27b5 100644 (file)
@@ -66,7 +66,7 @@ my @request = map {
                        $row{table} = ' ' x 1024;
                        $row{set} = 'Unicode planes';
                        $row{cell} = do 'charset-ucplanes.inc.pl'
                        $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;
                }
                        @nibble = (map { $_.0, $_.8 } 0 .. 7);
                        $nibsize = 8;
                }
@@ -75,20 +75,20 @@ my @request = map {
                                $row{table} = ' ' x ($endpoint < 255 ? 640 : 8192);
                                $row{set} = 'Unicode BMP';
                                $row{cell} = do 'charset-unicode.inc.pl'
                                $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'
                        }
                        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} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
                        }
                }
                else {
                        }
                        else {
                                $row{table} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
                        }
                }
                else {
-                       say "<p class=error>Encoding <q>$input</q> unknown</p>";
+                       Alert("Encoding <q>$input</q> unknown");
                }
                $row{set} ? \%row : ();
        }
                }
                $row{set} ? \%row : ();
        }
index 81f91b5..e4cc5f9 100644 (file)
@@ -10,9 +10,15 @@ use File::stat 'stat';
 use HTTP::Date;
 use Encode qw( decode_utf8 );
 
 use HTTP::Date;
 use Encode qw( decode_utf8 );
 
+sub Alert {
+       my ($title, $debug) = @_;
+       $title .= ": <em>$debug</em>" if $Dev and defined $debug;
+       say "<p class=error>$title</p>\n";
+}
+
 $PLP::ERROR = sub {
        my ($text, $html) = @_;
 $PLP::ERROR = sub {
        my ($text, $html) = @_;
-       print '<p class="error"><strong>Fatal error</strong>: '.$html."</p>\n\n";
+       Alert("<strong>Fatal error</strong>: $html.");
        warn $text;
 };
 
        warn $text;
 };
 
index 9dd8fe9..529b334 100644 (file)
--- a/latin.plp
+++ b/latin.plp
@@ -48,7 +48,7 @@ and <a href="/unicode">common chars</a>.</p>
 <:
 my @table = do 'writing-latn.inc.pl';
 if ($! or $@) {
 <:
 my @table = do 'writing-latn.inc.pl';
 if ($! or $@) {
-       printf "<p class=error>Table data not found: <em>%s</em>.</p>\n", $@ || $!;
+       Alert("Table data not found", $@ || $!);
 }
 else {
        say '<table class="glyphs">';
 }
 else {
        say '<table class="glyphs">';