Changeset 10443

Timestamp:

2005-08-09T10:46:44+12:00 (19 years ago)

Author:

chi

Message:

Modifications to check different StructuredHTML formating conditions.

File:

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

trunk/gsdl/perllib/plugins/StructuredHTMLPlug.pm

@@ -107 +107 @@
     # If checkout_toc is enables, it means to get rid of toc and tof contents.
     # get rid of TOC and TOF sections and their title
-    #if (defined $self->{'checkout_toc'}){
+    if (defined $self->{'checkout_toc'}){
     #line-height:150%;mso-ansi-language:FR'>Contents<o:p></o:p></span></b></p>
     # get rid of Table of Contents title and Table of Figures 
     #$body_text =~ s/<p[^>]*><b><span[^>]*>(Table of Content.|Content.)<o:p><\/o:p><\/span><\/b><\/p>//isg;
     #$body_text =~ s/<p[^>]*><b><span[^>]*>(Table of Figure.|Figure.)<o:p><\/o:p><\/span><\/b><\/p>//isg;
-    #$body_text =~ s/<p class=(($self->{'toc_header'})[^>]*)>(.+?)<\/p>//isg;
-    #$body_text =~ s/<p class=(($self->{'tof_header'})[^>]*)>(.+?)<\/p>//isg;
-    #}
+    $body_text =~ s/<p class=(($self->{'toc_header'})[^>]*)>(.+?)<\/p>//isg;
+    $body_text =~ s/<p class=(($self->{'tof_header'})[^>]*)>(.+?)<\/p>//isg;
+    }
 
     if (defined $self->{'title_header'}){
@@ -120 +120 @@
     $body_text =~ s/<p class=(($self->{'title_header'})[^>]*)>(.+?)<\/p>/<p class=$1><title>$3<\/title><\/p>/isg;
     }
-    if (defined $self->{'level1_header'}){
-    $self->{'level1_header'} =~ s/^(\()(.*)(\))/$2/is;
-    $body_text =~ s/<p class=(($self->{'level1_header'})[^>]*)>(.+?)<\/p>/<p class=$1><h1>$3<\/h1><\/p>/isg;
-    }
+
+    if (defined $self->{'level1_header'} && $self->{'level1_header'}=~ /\S/ ){
+        $self->{'level1_header'} =~ s/^\((.*)\)/$1/i;
+    $body_text =~ s/<p class=(($self->{'level1_header'})[^>]*)>(.+?)<\/p>/<p class=$1><h1>$3<\/h1><\/p>/ig;
+    }
+    
     if (defined $self->{'level2_header'}){
-    $self->{'level2_header'} =~ s/^(\()(.*)(\))/$2/is;
-    $body_text =~ s/<p class=(($self->{'level2_header'})[^>]*)>(.+?)<\/p>/<p class=$1><h2>$3<\/h2><\/p>/isg;
-    }
-    
-    if (defined $self->{'level3_header'}){
-    $self->{'level3_header'} =~ s/^(\()(.*)(\))/$2/is;
+    $self->{'level2_header'} =~ s/^\((.*)\)/$1/i;
+    $body_text =~ s/<p class=(($self->{'level2_header'})[^>]*)>(.+?)<\/p>/<p class=$1><h2>$3<\/h2><\/p>/ig;
+    }
+    
+    if (defined $self->{'level3_header'}&& $self->{'level3_header'}=~ /\S/ ){
+    $self->{'level3_header'} =~ s/^\((.*)\)/$1/is;
     $body_text =~ s/<p class=(($self->{'level3_header'})[^>]*)>(.+?)<\/p>/<p class=$1><h3>$3<\/h3><\/p>/isg;
     }