Changeset 23392

Timestamp:

2010-12-07T11:32:49+13:00 (13 years ago)

Author:

sjm84

Message:

Reverted a regular expression designed to locate various tags inside comments (David)

File:

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

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

@@ -702 +702 @@
 ##  $$textref =~ s/(<img[^>]*?usemap\s*=\s*[\"\']?)([^\"\'>\s]+)([\"\']?[^>]*>)/
 
-    my $opencom = '(?:<!--|&lt;!(?:&mdash;|&#151;|--))';
-    my $closecom = '(?:-->|(?:&mdash;|&#151;|--)&gt;)';
+##  my $opencom = '(?:<!--|&lt;!(?:&mdash;|&#151;|--))';
+##  my $closecom = '(?:-->|(?:&mdash;|&#151;|--)&gt;)';
 
     $$textref =~ s/(<img[^>]*?usemap\s*=\s*)((?:[\"][^\"]+[\"])|(?:[\'][^\']+[\'])|(?:[^\s\/>]+))([^>]*>)/
         $self->replace_usemap_links($1, $2, $3)/isge;
 
-##  $$textref =~ s/(<(?:a|area|frame|link|script)\s+[^>]*?\s*(?:href|src)\s*=\s*[\"\']?)([^\"\'>\s]+)([\"\']?[^>]*>)/
+    $$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)?+/
-        $self->replace_href_links ($1, $2, $3, $4, $5, $base_dir, $file, $doc_obj, $cursection)/isge;
+##  $$textref =~ s/($opencom.*?)?+(<(?:a|area|frame|link|script)\s+[^>]*?\s*(?:href|src)\s*=\s*)((?:[\"][^\"]+[\"])|(?:[\'][^\']+[\'])|(?:[^\s\/>]+))([^>]*>)(.*?$closecom)?+/
+#       $self->replace_href_links ($1, $2, $3, $4, $5, $base_dir, $file, $doc_obj, $cursection)/isge;
     }
 
@@ -794 +795 @@
 sub replace_href_links {
     my $self = shift (@_);
-    my ($opt_open_comm, $front, $link, $back, $opt_close_comm, $base_dir, $file, $doc_obj, $section) = @_;
-
-    if ((defined $opt_open_comm) && (defined $opt_close_comm)) {
-    # href link was embedded in <!-- comments -->
-### print STDERR "****** Link in comment, skipping $link\n";
-    return $opt_open_comm . $front . $link . $back . $opt_close_comm;
-    }
+    my ($front, $link, $back, $base_dir, $file, $doc_obj, $section) = @_;
 
     # remove quotes from link at start and end if necessary