Changeset 16799 for gsdl/trunk/perllib/plugins/HTMLPlugin.pm

Timestamp:

2008-08-14T20:18:50+12:00 (16 years ago)

Author:

ak19

Message:

URL encoding href links for internal links since the database lookup has trouble with keys that are UTF8

File:

• gsdl/trunk/perllib/plugins/HTMLPlugin.pm (modified) (3 diffs)

gsdl/trunk/perllib/plugins/HTMLPlugin.pm

@@ -710 +710 @@
     my ($tailname,$dirname,$suffix) = &File::Basename::fileparse($file, "\\.[^\\.]+\$");
     my $utf8_file = $self->filename_to_utf8_metadata($file);
-#    $utf8_file = &unicode::url_encode($utf8_file);
 
     my $web_url = "http://";
@@ -718 +717 @@
     $web_url = $web_url.$utf8_file;
     }
+    # URL encode this in unison with web_url since database lookup via Java code does not handle utf8-encoded keys
+    $web_url = &unicode::url_encode($web_url);
 #    print STDERR "#### weburl: $web_url\n";
 
@@ -1079 +1080 @@
     if (($rl == 0) || ($filename =~ m/$self->{'process_exp'}/) || 
     ($href =~ m/\/$/) || ($href =~ m/^(mailto|news|gopher|nntp|telnet|javascript):/i)) {
-    &ghtml::urlsafe ($href);
+    # URL encode this in unison with web_url since database lookup via Java code does not handle utf8-encoded keys
+    # No longer need to &ghtml::urlsafe($href) for special characters, since the entire thing is going to be URL-encoded
+    $href = &unicode::url_encode($href);
     return $front . "_httpextlink_&rl=" . $rl . "&href=" . $href . $hash_part . $back;
     } else {