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

Timestamp:

2008-08-15T13:57:21+12:00 (16 years ago)

Author:

ak19

Message:

Undid the changes introduced in the last commit which url encode the href_link and web_url, since the database can manage UTF8 keys after all after making some small change to GDBMWrapper. While previous changes got interlinking htmls with multilingual filenames working for GS3 they failed for GS2 (for which they were previously working). Now it should hopefully work for both.

File:

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

gsdl/trunk/perllib/plugins/HTMLPlugin.pm

@@ -717 +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";
 
@@ -1080 +1078 @@
     if (($rl == 0) || ($filename =~ m/$self->{'process_exp'}/) || 
     ($href =~ m/\/$/) || ($href =~ m/^(mailto|news|gopher|nntp|telnet|javascript):/i)) {
-    # 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);
+    &ghtml::urlsafe ($href);
     return $front . "_httpextlink_&rl=" . $rl . "&href=" . $href . $hash_part . $back;
     } else {