Changeset 10496

Timestamp:

2005-08-11T17:27:49+12:00 (19 years ago)

Author:

kjdon

Message:

added some sanity checks, renamed the checkout_toc option to delete_toc

Location:

trunk/gsdl/perllib/plugins

Files:

• StructuredHTMLPlug.pm (modified) (3 diffs)
• WordPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/plugins/StructuredHTMLPlug.pm

@@ -96 +96 @@
     my $body_text = join("<body", @head_and_body);
     
-    if (defined $self->{'extracted_word_metadata_fields'}) {
+    if (defined $self->{'extracted_word_metadata_fields'} && $self->{'extracted_word_metadata_fields'}=~ /\S/) {
     my @doc_properties = split(/<xml>/i,$head);
     my $doc_heading = shift(@doc_properties);
@@ -105 +105 @@
     }
     
-    # If checkout_toc is enables, it means to get rid of toc and tof contents.
+    # If delete_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 ($self->{'delete_toc'} == 1){
     #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 
+    # these two lines don't work - how can we do this properlly??
     #$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;
-    }
-
-    if (defined $self->{'title_header'}){
+    if (defined $self->{'toc_header'}&& $self->{'toc_header'} =~ /\S/){
+        $body_text =~ s/<p class=(($self->{'toc_header'})[^>]*)>(.+?)<\/p>//isg;
+    }
+    if (defined $self->{'tof_header'}&& $self->{'tof_header'}=~ /\S/) {
+        $body_text =~ s/<p class=(($self->{'tof_header'})[^>]*)>(.+?)<\/p>//isg;
+    }
+    }
+
+    if (defined $self->{'title_header'} && $self->{'title_header'}=~ /\S/){
     $self->{'title_header'} =~ s/^(\()(.*)(\))/$2/is;
     $body_text =~ s/<p class=(($self->{'title_header'})[^>]*)>(.+?)<\/p>/<p class=$1><title>$3<\/title><\/p>/isg;
@@ -126 +131 @@
     }
     
-    if (defined $self->{'level2_header'}){
+    if (defined $self->{'level2_header'} && $self->{'level2_header'}=~ /\S/){
     $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/ ){
+    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;

trunk/gsdl/perllib/plugins/WordPlug.pm

@@ -28 +28 @@
 
 use ConvertToPlug;
-require StructuredHTMLPlug;
 use strict;
 no strict 'refs'; # allow filehandles to be variables and viceversa
 
 sub BEGIN {
-    #@WordPlug::ISA = ('ConvertToPlug','StructuredHTMLPlug');
     @WordPlug::ISA = ('ConvertToPlug');
 }
@@ -61 +59 @@
              'type' => "flag",
                  'reqd' => "no" },
-               { 'name' => "checkout_toc",
-             'desc' => "{WordPlug.checkout_toc}",
+               { 'name' => "delete_toc",
+             'desc' => "{WordPlug.delete_toc}",
              'type' => "flag",
              'reqd' => "no"},
@@ -127 +125 @@
         push (@$structhtml_options , "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
         push (@$structhtml_options, "-description_tags") if $self->{'windows_scripting'};
-        push (@$structhtml_options, "-checkout_toc") if $self->{'checkout_toc'};
+        push (@$structhtml_options, "-delete_toc") if $self->{'delete_toc'};
         push (@$structhtml_options, "-toc_header", $self->{'toc_header'}) if $self->{'toc_header'};
         push (@$structhtml_options, "-tof_header", $self->{'tof_header'}) if $self->{'tof_header'};