Changeset 18410

Timestamp:

2009-01-21T19:13:52+13:00 (15 years ago)

Author:

ak19

Message:

Some changes made in url and base64 encoding to deal with when the character entity for underscore had replaced the underscore (after dmsafing a filename so it won't cause conflicts with GS macros).

File:

• gsdl/trunk/perllib/unicode.pm (modified) (4 diffs)

gsdl/trunk/perllib/unicode.pm

@@ -584 +584 @@
     if (!&is_url_encoded($text)) {
     $text =~ s/([^A-Z0-9\ \.\-\_])/sprintf("%%%02X", ord($1))/iseg;
+    # return the url-encoded character entity for underscore back to the entity
+    $text =~ s/%26%23095%3B/&\#095;/g;
     }
     return $text;
@@ -608 +610 @@
     my ($text) =@_;
     $text =~ s/%25/%/g if &is_url_encoded($text);
+    # DM safing would have replaced underscores with character entity _ 
+    # in SourceFile meta. Undo any such change to get the filename referred to.
+    $text =~ s/&\#095;/_/g;
     return $text;
 }
 
 # When a filename on the filesystem is already URL-encoded, the
-# URL to it will have %25s in in place of every % sign, so that 
+# URL to it will have %25s in place of every % sign, so that 
 # URLs in html pages can refer to the URL-encoded filename.
 # Given a (URL-encoded) filename on the filesystem, this subroutine
@@ -631 +636 @@
     my ($text) = @_;
     if(!&conforms_to_mod_base64($text)) {
+    # return entity for underscore to underscore before encoding
+    $text =~ s/&\#095;/_/g;
+
     $text = &MIME::Base64::encode_base64($text);
     # base64 encoding may introduce + and / signs,
@@ -663 +671 @@
 sub conforms_to_mod_base64 {
     my ($text) = @_;
+
+    # need to treat the entity ref for underscore as underscore
+    $text =~ s/&\#095;/_/g;
+
     # base 64 takes alphanumeric and [=+/], 
     # but we use modified base64 where + and / are replaced with  - and _