Changeset 18521

Timestamp:

2009-02-16T11:52:50+13:00 (15 years ago)

Author:

davidb

Message:

& in URLs encoded at &. The former used to work in most browsers, however having it escaped is considered better from (and consisent with what the standard expects). Fix thanks to DL Consulting.

File:

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

gsdl/trunk/perllib/plugins/HTMLPlugin.pm

@@ -1069 +1069 @@
     ($href =~ m/\/$/) || ($href =~ m/^(mailto|news|gopher|nntp|telnet|javascript):/i)) {
     &ghtml::urlsafe ($href);
-    return $front . "_httpextlink_&rl=" . $rl . "&href=" . $href . $hash_part . $back;
+    return $front . "_httpextlink_&rl=" . $rl . "&href=" . $href . $hash_part . $back;
     } else {
     # link is to some other type of file (eg image) so we'll
@@ -1112 +1112 @@
     if ($rl == 0) {
     if ((!defined $ext) || ($ext !~ m/$self->{'assoc_files'}/)) {
-        return "_httpextlink_&rl=0&el=prompt&href=" . $href . $hash_part;
+        return "_httpextlink_&rl=0&el=prompt&href=" . $href . $hash_part;
     }
     else {
-        return "_httpextlink_&rl=0&el=direct&href=" . $href . $hash_part;
+        return "_httpextlink_&rl=0&el=direct&href=" . $href . $hash_part;
     }
     }
 
     if ((!defined $ext) || ($ext !~ m/$self->{'assoc_files'}/)) {
-    return "_httpextlink_&rl=" . $rl . "&href=" . $href . $hash_part;
+    return "_httpextlink_&rl=" . $rl . "&href=" . $href . $hash_part;
     }
     if ($self->{'rename_assoc_files'}) {
@@ -1380 +1380 @@
         $found_title = 1;
     }
-    print $outhandle " extracted \"$tag\" metadata \"$value\"\n" 
-        if ($self->{'verbosity'} > 2);
-    if ($tag =~ m/date.*/i){
-        $tag = lc($tag);
-    }
+
+    if ($self->{'verbosity'} > 2) {
+        print $outhandle " extracted \"$tag\" metadata \"$value\"\n";
+    }
+
+    # Do we still reply on the following?  Surely there must 
+    # be a better way to go about this outside of the plugin?
+    # 
+    #if ($tag =~ m/date.*/i){
+    #    $tag = lc($tag);
+    #}
+
     $doc_obj->add_utf8_metadata($section, $tag, $value);