Changeset 23362 for main/trunk/greenstone2/perllib/ghtml.pm

Timestamp:

2010-12-01T11:40:36+13:00 (13 years ago)

Author:

davidb

Message:

Additional routines (and few upgraded) to help support Greenstone working with filenames under Windows when then go beyond Latin-1 and start turning up in their DOS abbreviated form (e.g. Test~1.txt)

File:

• main/trunk/greenstone2/perllib/ghtml.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/ghtml.pm

@@ -207 +207 @@
 
     # a numeric entity
-    if ($entity =~ /^\#0*(\d+)/) {
-    my $code=$1;
+    my $code = undef;
+    if ($entity =~ m/^\#0*(\d+)$/) {
+    $code=$1;
+    }
+    elsif ($entity =~ m/^\#x([0-9A-F]+)$/i) {
+    $code=hex($1);
+    }
+
+    if (defined $code) {
     # non-standard Microsoft breakage, as usual
     if ($code < 0x9f) { # code page 1252 uses reserved bytes