Changeset 16900

Timestamp:

2008-08-19T14:32:48+12:00 (16 years ago)

Author:

ak19

Message:

1. URL_encode method now only encodes urls if they are not already encoded (prevents double encoding). 2. new subroutine is_url_encoded returns true if the given string is already url_encoded

File:

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

gsdl/trunk/perllib/unicode.pm

@@ -578 +578 @@
 sub url_encode {
     my ($text) = @_;
-    $text =~ s/([^A-Z0-9\.\-\_])/sprintf("%%%02X", ord($1))/iseg;
-
+    if (!&is_url_encoded($text)) {
+    print STDERR "*** not percent encoded yet\n";
+    $text =~ s/([^A-Z0-9\.\-\_])/sprintf("%%%02X", ord($1))/iseg;
+    }
     return $text;
 }
@@ -588 +590 @@
     $text =~ s/\%([A-F0-9]{2})/pack('C', hex($1))/ige;
     return $text;
+}
+
+sub is_url_encoded {
+    my ($text) = @_;
+    return ($text =~ m/\%([A-F0-9]{2})/);
 }