Changeset 2995 for trunk/gsdl

Timestamp:

2002-02-24T10:09:50+13:00 (22 years ago)

Author:

sjboddie

Message:

Fixed a bug preventing HTML headers from being removed correctly when using
the -description_tags HTMLPlug flag. <Section> tags will now be ignored if
they occur within the head of the document, they should all instead be
within the body.

File:

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

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -160 +160 @@
     if ($self->{'description_tags'}) {
 
+    # remove the html header - note that doing this here means any
+    # sections defined within the header will be lost (so all <Section>
+    # tags must appear within the body of the HTML)
+    $$textref =~ s/^.*?<body[^>]*>//is;
+    $$textref =~ s/(<\/body[^>]*>|<\/html[^>]*>)//isg;
+
     my $opencom = '(?:<!--|&lt;!(?:&mdash;|&#151;|--))';
     my $closecom = '(?:-->|(?:&mdash;|&#151;|--)&gt;)';
@@ -233 +239 @@
     
     } else {
+
+    # remove header and footer
+    if (!$self->{'keep_head'} || $self->{'description_tags'}) {
+        $$textref =~ s/^.*?<body[^>]*>//is;
+        $$textref =~ s/(<\/body[^>]*>|<\/html[^>]*>)//isg;
+    }
+
     # single section document
     $self->process_section($textref, $base_dir, $file, $doc_obj, $cursection);
@@ -245 +258 @@
     my $self = shift (@_);
     my ($textref, $base_dir, $file, $doc_obj, $cursection) = @_;
-
-    # remove header and footer
-    if (!$self->{'keep_head'} || $self->{'description_tags'}) {
-    $$textref =~ s/^.*?<body[^>]*>//is;
-    $$textref =~ s/(<\/body[^>]*>|<\/html[^>]*>)//isg;
-    }
 
     # trap links