Changeset 11380

Timestamp:

2006-03-16T16:02:16+13:00 (18 years ago)

Author:

kjdon

Message:

davids fixes for a couple of warnings

File:

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

trunk/gsdl/perllib/plugins/StructuredHTMLPlug.pm

@@ -102 +102 @@
     my $doc_heading = shift(@doc_properties);
     my $rest_doc_properties = join(" ", @doc_properties);
+
     my @extracted_metadata = split(/<\/xml>/i, $rest_doc_properties);
     my $extracted_metadata = shift (@extracted_metadata);
@@ -109 +110 @@
     # 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 ($self->{'delete_toc'} == 1){
+    if (defined $self->{'delete_toc'} && ($self->{'delete_toc'} == 1)){
     if (defined $self->{'toc_header'}&& $self->{'toc_header'} =~ /\S/){
         $body_text =~ s/<p class=(($self->{'toc_header'})[^>]*)>(.+?)<\/p>//isg;
@@ -385 +386 @@
     my $outhandle = $self->{'outhandle'};
     
+    return if (!defined $textref);
+
     # metadata fields to extract/save. 'key' is the (lowercase) name of the
     # html meta, 'value' is the metadata name for greenstone to use
@@ -402 +405 @@
         $orig_field = $field;
     }
+
     if ($textref =~ m/<o:$orig_field>(.*)<\/o:$orig_field>/i){
         $tag = $orig_field;