Changeset 23514

Timestamp:

2010-12-20T00:22:43+13:00 (13 years ago)

Author:

davidb

Message:

Two small, but important changes:

1)Javascripts form of escaping puts in a 'u', as in #u1025

2)When URL encoding a filename we need to encode any literal '%' character into its %xx form as well.

File:

• main/trunk/greenstone2/perllib/unicode.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/unicode.pm

@@ -633 +633 @@
     if ((defined $and_numeric_entities) && ($and_numeric_entities)) {
     $text =~ s/\&\#x([0-9A-F]+);/pack('C', hex($1))/ige;
-    $text =~ s/\&\#([0-9]+);/pack('C', $1)/ige;
+    $text =~ s/\&\#u?([0-9]+);/pack('C', $1)/ige;
     }
 
@@ -764 +764 @@
     = map { $_ > 255 ?                  # Needs to be represent in entity form
             sprintf("&#x%X;",$_) :  
-            $_ > 128 ?              # Representable in %XX form
+            $_>128 || $_==ord("%") ?              # Representable in %XX form
             sprintf("%%%2X", $_) :  
             chr($_)                 # otherwise, Ascii char