Changeset 7019

Timestamp:

2004-03-11T12:32:01+13:00 (20 years ago)

Author:

jrm21

Message:

fall back gracefully if -use_sections argument was given but no Sections can
be found.

File:

• trunk/gsdl/perllib/plugins/PDFPlug.pm (modified) (5 diffs)

trunk/gsdl/perllib/plugins/PDFPlug.pm

@@ -80 +80 @@
              "allow_extra_options")) {
 
-    print STDERR "\nIncorrect options passed to PDFPlug, check your collect.cfg configuration file\n";
     local $self = new ConvertToPlug($class, @_, "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
+    my $outhandle=$self->{'outhandle'};
+    print $outhandle "\nIncorrect options passed to PDFPlug, check your collect.cfg configuration file\n";
     $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
+    exit 1;
     }
 
@@ -158 +159 @@
 sub process {
     my $self = shift (@_);
+    my $outhandle=$self->{'outhandle'};
+
     if ($self->{'use_sections'}
     && $self->{'converted_to'} eq "HTML") {
 
-    print STDERR "PDFPlug: Calculating sections...\n";
+    print $outhandle "PDFPlug: Calculating sections...\n";
     my $textref=$_[0];
 
@@ -167 +170 @@
     my @sections = split('<a name=', $$textref);
 
-    shift @sections; # don't need HTML header, etc
+    if (scalar (@sections) == 1) { #only one section - no split!
+        print $outhandle "PDFPlug: warning - no sections found\n";
+    } else {
+        shift @sections; # don't need HTML header, etc
+    }
+
     # handle first section specially for title? Or all use first 100...
     
@@ -183 +191 @@
     $title =~ s/\s\S*$/.../;
 
-    my $top_section = "<!--<Section>\n<Metadata name=\"Title\">$title</Metadata>\n-->\n <!--</Section>-->\n";
+    my $top_section;
+    if (scalar (@sections) == 1) { # no sections found
+        $top_section=$sections[0];
+        @sections=();
+    } else {
+        $top_section = "<!--<Section>\n<Metadata name=\"Title\">$title</Metadata>\n-->\n <!--</Section>-->\n";
+    }
 
     # add metadata per section...
@@ -204 +218 @@
     }
 
-    my $outhandle = $self->{'outhandle'};
     print $outhandle "PDFPlug: passing $_[3] on to $self->{'converted_to'}Plug\n"
     if $self->{'verbosity'} > 1;