X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/504c0879e49d9ffb9575ad6549c21d3990dc27d0..108d13f833e9daeff4ea1552e2e1bee1e0ed8c22:/charset.plp

diff --git a/charset.plp b/charset.plp
index ebcbc32..4c01b78 100644
--- a/charset.plp
+++ b/charset.plp
@@ -31,12 +31,12 @@ use Encode qw(decode resolve_alias);
 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 = $_) {
@@ -89,15 +89,15 @@ my @request = map {
 			}
 		}
 		else {
-			print "<p>Encoding $input unknown</p>\n";
+			say "<p class=error>Encoding <q>$input</q> unknown</p>";
 		}
-		\%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 +123,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 +133,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 +182,7 @@ for my $row (@request) {
 		}
 		print "\n";
 	}
-	print "</table></div>\n";
+	say '</table></div>';
 }
 
 :>