Changeset 23463 for main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm

Timestamp:

2010-12-13T15:24:36+13:00 (13 years ago)

Author:

ak19

Message:

Previously, when reverting back to an earlier RE match for replace_href_links, we reverted back too far (back to an earlier one that had a problem with spaces withing an href="...")

File:

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

main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm

@@ -710 +710 @@
         $self->replace_usemap_links($1, $2, $3)/isge;
 
-    $$textref =~ s/(<(?:a|area|frame|link|script)\s+[^>]*?\s*(?:href|src)\s*=\s*[\"\']?)([^\"\'>\s]+)([\"\']?[^>]*>)/
-        $self->replace_href_links ($1, $2, $3, $base_dir, $file, $doc_obj, $cursection)/isge;
+    $$textref =~ s/(<(?:a|area|frame|link|script)\s+[^>]*?\s*(?:href|src)\s*=\s*)((?:[\"][^\"]+[\"])|(?:[\'][^\']+[\'])|(?:[^\s\/>]+))([^>]*>)/
+        $self->replace_href_links ($1, $2, $3, $base_dir, $file, $doc_obj, $cursection)/isge; 
     
 ##  $$textref =~ s/($opencom.*?)?+(<(?:a|area|frame|link|script)\s+[^>]*?\s*(?:href|src)\s*=\s*)((?:[\"][^\"]+[\"])|(?:[\'][^\']+[\'])|(?:[^\s\/>]+))([^>]*>)(.*?$closecom)?+/
@@ -798 +798 @@
     my $self = shift (@_);
     my ($front, $link, $back, $base_dir, $file, $doc_obj, $section) = @_;
-
+    
     # remove quotes from link at start and end if necessary
     if ($link=~/^[\"\']/) {
@@ -1039 +1039 @@
     # strip off hash part, e.g. #foo, but watch out for any entities, e.g. &#x3B1;
     my ($before_hash, $hash_part) = $link =~ m/^(.*?[^&])(\#.*)?$/;
-    
+    
     $hash_part = "" if !defined $hash_part;
     if (!defined $before_hash || $before_hash !~ m/[\w\.\/]/) {
-    my $outhandle = $self->{'outhandle'};
-    print $outhandle "HTMLPlugin: ERROR - badly formatted tag ignored ($link)\n"
-        if $self->{'verbosity'};
-    return ($link, "", 0);
-    }
-
+        my $outhandle = $self->{'outhandle'};
+        print $outhandle "HTMLPlugin: ERROR - badly formatted tag ignored ($link)\n"
+            if $self->{'verbosity'};
+        return ($link, "", 0);
+    }
+    
     if ($before_hash =~ s@^((?:http|https|ftp|file|mms)://)@@i) {
-    my $type = $1;
+        my $type = $1;
 
     if ($link =~ m/^(http|ftp):/i) {